From b7d0bd784a553a9f294e4b831c8e5379fd09eb37 Mon Sep 17 00:00:00 2001 From: matt335672 <30179339+matt335672@users.noreply.github.com> Date: Thu, 3 Nov 2022 14:52:48 +0000 Subject: [PATCH 1/3] Bump autoconf version * Autoconf version from 2.65 -> 2.69 * AC_PROG_LIBTOOL replaced with LT_INIT * AC_HELP_STRING replaced with AS_HELP_STRING --- configure.ac | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 3759cd6b..04b64287 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # Process this file with autoconf to produce a configure script -AC_PREREQ(2.65) +AC_PREREQ([2.69]) AC_INIT([xrdp], [0.9.80], [xrdp-devel@googlegroups.com]) AC_CONFIG_HEADERS(config_ac.h:config_ac-h.in) AM_INIT_AUTOMAKE([1.7.2 foreign]) @@ -8,7 +8,7 @@ AC_CONFIG_MACRO_DIR([m4]) AC_PROG_CC AC_PROG_CXX AC_C_CONST -AC_PROG_LIBTOOL +LT_INIT PKG_PROG_PKG_CONFIG if test "x$PKG_CONFIG" = "x"; then @@ -82,7 +82,7 @@ fi AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ]) AC_ARG_ENABLE(tests, - AC_HELP_STRING([--enable-tests], + AS_HELP_STRING([--enable-tests], [Ensure dependencies for the tests are installed]), [ensure_tests_deps=yes], []) AC_ARG_ENABLE(pam, AS_HELP_STRING([--enable-pam], @@ -188,9 +188,9 @@ AC_ARG_ENABLE(rdpsndaudin, AS_HELP_STRING([--enable-rdpsndaudin], [], [enable_rdpsndaudin=no]) AM_CONDITIONAL(XRDP_RDPSNDAUDIN, [test x$enable_rdpsndaudin = xyes]) -AC_ARG_WITH(imlib2, AC_HELP_STRING([--with-imlib2=ARG], [imlib2 library to use for non-BMP backgrounds (ARG=yes/no/)]),,) +AC_ARG_WITH(imlib2, AS_HELP_STRING([--with-imlib2=ARG], [imlib2 library to use for non-BMP backgrounds (ARG=yes/no/)]),,) -AC_ARG_WITH(freetype2, AC_HELP_STRING([--with-freetype2=ARG], [freetype2 library to use for rendering fonts (ARG=yes/no/)]),,) +AC_ARG_WITH(freetype2, AS_HELP_STRING([--with-freetype2=ARG], [freetype2 library to use for rendering fonts (ARG=yes/no/)]),,) # Obsolete options AC_ARG_ENABLE(xrdpdebug, AS_HELP_STRING([--enable-xrdpdebug], From 17dda486a1c6d0297049345756e9b1ccb55cf270 Mon Sep 17 00:00:00 2001 From: matt335672 <30179339+matt335672@users.noreply.github.com> Date: Thu, 3 Nov 2022 14:53:47 +0000 Subject: [PATCH 2/3] Update ax_type_socklen_t.m4 to latest version Fixes warning about obsolete macro AC_TRY_COMPILE with autoconf 2.71 --- m4/ax_type_socklen_t.m4 | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/m4/ax_type_socklen_t.m4 b/m4/ax_type_socklen_t.m4 index 593e669a..eb444092 100644 --- a/m4/ax_type_socklen_t.m4 +++ b/m4/ax_type_socklen_t.m4 @@ -1,5 +1,5 @@ # =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_type_socklen_t.html +# https://www.gnu.org/software/autoconf-archive/ax_type_socklen_t.html # =========================================================================== # # SYNOPSIS @@ -27,7 +27,7 @@ # Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program. If not, see . +# with this program. If not, see . # # As a special exception, the respective Autoconf Macro's copyright owner # gives unlimited permission to copy, distribute and modify the configure @@ -42,18 +42,16 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -#serial 6 +#serial 8 AU_ALIAS([TYPE_SOCKLEN_T], [AX_TYPE_SOCKLEN_T]) AC_DEFUN([AX_TYPE_SOCKLEN_T], -[AC_CACHE_CHECK([for socklen_t], ac_cv_ax_type_socklen_t, -[ - AC_TRY_COMPILE( - [#include - #include ], - [socklen_t len = (socklen_t) 42; return (!len);], - ac_cv_ax_type_socklen_t=yes, - ac_cv_ax_type_socklen_t=no) +[AC_CACHE_CHECK([for socklen_t], [ac_cv_ax_type_socklen_t], +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include + #include ]], + [[socklen_t len = (socklen_t) 42; return (!len);]])], + [ac_cv_ax_type_socklen_t=yes], + [ac_cv_ax_type_socklen_t=no]) ]) if test $ac_cv_ax_type_socklen_t != yes; then AC_DEFINE(socklen_t, int, [Substitute for socklen_t]) From 9b007f1eecd98d417616312a478cd5903b942960 Mon Sep 17 00:00:00 2001 From: matt335672 <30179339+matt335672@users.noreply.github.com> Date: Thu, 3 Nov 2022 15:07:11 +0000 Subject: [PATCH 3/3] Updated submodule autoconf version to 2.69 --- libpainter | 2 +- librfxcodec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libpainter b/libpainter index 9a1fffa5..2255b386 160000 --- a/libpainter +++ b/libpainter @@ -1 +1 @@ -Subproject commit 9a1fffa55e1dbb1fa6e68677afe366a4d55822eb +Subproject commit 2255b3865e7b89afcbd2c310241d54dfa787b63e diff --git a/librfxcodec b/librfxcodec index c77afab7..30f6ce18 160000 --- a/librfxcodec +++ b/librfxcodec @@ -1 +1 @@ -Subproject commit c77afab7ce06f362b3e5184da78a4fb2396c498e +Subproject commit 30f6ce185c84edc6350bce0d6eae1a16edd2b1a3