Changeset b2b3700 in mod_gnutls

Timestamp:

Feb 23, 2023, 1:16:38 PM (4 weeks ago)

Author:

GitHub <noreply@…>

Branches:

main, master

Children:

82cb66b

Parents:

b732220 (diff), bb23c8e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Airtower <fiona.klute@…> (02/23/23 13:16:38)

git-committer:

GitHub <noreply@…> (02/23/23 13:16:38)

Message:

Merge pull request #16 from airtower-luna/obsolete-autoconf-macros

Replace obsolete Autoconf macros

Files:

• configure.ac (modified) (3 diffs)
• m4/apache.m4 (modified) (2 diffs)
• m4/apache_test.m4 (modified) (4 diffs)

configure.ac

@@ -1 @@
-AC_INIT(mod_gnutls, 0.12.0)
+AC_PREREQ([2.69])
+AC_INIT([mod_gnutls],[0.12.0])
 OOO_CONFIG_NICE(config.nice)
 MOD_GNUTLS_VERSION=AC_PACKAGE_VERSION
-AC_PREREQ(2.53)
 AC_CONFIG_SRCDIR([src/mod_gnutls.c])
 AC_CONFIG_AUX_DIR(config)
@@ -10 +10 @@
 # mod_gnutls test suite requires GNU make
 AM_INIT_AUTOMAKE([-Wno-portability])
-AM_CONFIG_HEADER(include/mod_gnutls_config.h:config.in)
+AC_CONFIG_HEADERS([include/mod_gnutls_config.h:config.in])
 
 LT_INIT([disable-static])
@@ -17 +17 @@
 
 AC_PROG_CC
-AC_PROG_CC_C99
-AC_PROG_LD
+m4_version_prereq([2.70], [:], [AC_PROG_CC_C99])
+LT_PATH_LD
 AC_PROG_INSTALL
-AC_PROG_LIBTOOL
+LT_INIT
 
 AC_CONFIG_MACRO_DIR([m4])

m4/apache.m4

@@ -8 +8 @@
 AC_ARG_WITH(
     apxs,
-    [AC_HELP_STRING([--with-apxs=PATH],[Path to apxs])],
+    [AS_HELP_STRING([--with-apxs=PATH],[Path to apxs])],
     apxs_prefix="$withval",
     apxs_prefix="/usr"
@@ -15 +15 @@
 AC_ARG_ENABLE(
         apachetest,
-        [AC_HELP_STRING([--disable-apxstest],[Do not try to compile and run apache version test program])],
+        [AS_HELP_STRING([--disable-apxstest],[Do not try to compile and run apache version test program])],
         ,
         enable_apachetest=yes

m4/apache_test.m4

@@ -13 +13 @@
         CFLAGS="$CFLAGS $APU_INCLUDES $APR_INCLUDES"
     fi
-    AC_TRY_RUN([
+    AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <stdio.h>
 #include <stdlib.h>
@@ -64 +64 @@
 }
 
-],, no_apache=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+]])], [], [no_apache=yes], [echo $ac_n "cross compiling; assumed OK... $ac_c"])
     CFLAGS="$ac_save_CFLAGS"
 
@@ -78 +78 @@
                 CFLAGS="$CFLAGS $APU_INCLUDES $APR_INCLUDES"
             fi
-            AC_TRY_LINK([
+            AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #include <stdio.h>
 #include "httpd.h"
@@ -86 +86 @@
 #undef main
 #define main K_and_R_C_main
-],                [ return 0; ],
+]], [[ return 0; ]])],
                 [ echo "*** The test program compiled, but failed to run. Check config.log" ],
                 [ echo "*** The test program failed to compile or link. Check config.log" ])