Merge pull request #2408 from matt335672/bump_autoconf_ver

Bump autoconf ver

4 files changed, 14 insertions, 16 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/<abs-path>)]),,)
+AC_ARG_WITH(imlib2, AS_HELP_STRING([--with-imlib2=ARG], [imlib2 library to use for non-BMP backgrounds (ARG=yes/no/<abs-path>)]),,)
 
-AC_ARG_WITH(freetype2, AC_HELP_STRING([--with-freetype2=ARG], [freetype2 library to use for rendering fonts (ARG=yes/no/<abs-path>)]),,)
+AC_ARG_WITH(freetype2, AS_HELP_STRING([--with-freetype2=ARG], [freetype2 library to use for rendering fonts (ARG=yes/no/<abs-path>)]),,)
 
 # Obsolete options
 AC_ARG_ENABLE(xrdpdebug, AS_HELP_STRING([--enable-xrdpdebug],
diff --git a/libpainter b/libpainter
-Subproject 9a1fffa55e1dbb1fa6e68677afe366a4d55822e
+Subproject 2255b3865e7b89afcbd2c310241d54dfa787b63
diff --git a/librfxcodec b/librfxcodec
-Subproject c77afab7ce06f362b3e5184da78a4fb2396c498
+Subproject 30f6ce185c84edc6350bce0d6eae1a16edd2b1a
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 <http://www.gnu.org/licenses/>.
+#   with this program. If not, see <https://www.gnu.org/licenses/>.
 #
 #   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 <sys/types.h>
-   #include <sys/socket.h>],
-  [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 <sys/types.h>
+  #include <sys/socket.h>]],
+  [[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])