]> granicus.if.org Git - apache/blobdiff - acinclude.m4
util.c: revert r1799375 during veto discussion
[apache] / acinclude.m4
index 6b24241d8fd0db039aea3a9ea59fe07042cda102..3ab82d726b001f2db1ecbda8d71a6f9c16ac707c 100644 (file)
@@ -4,25 +4,27 @@ dnl Autoconf 2.50 can not handle substr correctly.  It does have
 dnl AC_HELP_STRING, so let's try to call it if we can.
 dnl Note: this define must be on one line so that it can be properly returned
 dnl as the help string.
-AC_DEFUN(APACHE_HELP_STRING,[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING($1,$2),[  ]$1 substr([                       ],len($1))$2)])dnl
+AC_DEFUN([APACHE_HELP_STRING],[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING($1,$2),[  ]$1 substr([                       ],len($1))$2)])dnl
 
 dnl APACHE_SUBST(VARIABLE)
 dnl Makes VARIABLE available in generated files
 dnl (do not use @variable@ in Makefiles, but $(variable))
-AC_DEFUN(APACHE_SUBST,[
+AC_DEFUN([APACHE_SUBST],[
   APACHE_VAR_SUBST="$APACHE_VAR_SUBST $1"
   AC_SUBST($1)
 ])
 
 dnl APACHE_FAST_OUTPUT(FILENAME)
 dnl Perform substitutions on FILENAME (Makefiles only)
-AC_DEFUN(APACHE_FAST_OUTPUT,[
+AC_DEFUN([APACHE_FAST_OUTPUT],[
   APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $1"
 ])
 
 dnl APACHE_GEN_CONFIG_VARS
 dnl Creates config_vars.mk
-AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
+AC_DEFUN([APACHE_GEN_CONFIG_VARS],[
+  APACHE_SUBST(HTTPD_VERSION)
+  APACHE_SUBST(HTTPD_MMN)
   APACHE_SUBST(abs_srcdir)
   APACHE_SUBST(bindir)
   APACHE_SUBST(sbindir)
@@ -91,6 +93,8 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
   APACHE_SUBST(MK_IMPLIB)
   APACHE_SUBST(MKDEP)
   APACHE_SUBST(INSTALL_PROG_FLAGS)
+  APACHE_SUBST(MPM_MODULES)
+  APACHE_SUBST(ENABLED_MPM_MODULE)
   APACHE_SUBST(DSO_MODULES)
   APACHE_SUBST(ENABLED_DSO_MODULES)
   APACHE_SUBST(LOAD_ALL_MODULES)
@@ -117,23 +121,16 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
 
 dnl APACHE_GEN_MAKEFILES
 dnl Creates Makefiles
-AC_DEFUN(APACHE_GEN_MAKEFILES,[
+AC_DEFUN([APACHE_GEN_MAKEFILES],[
   $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $BSD_MAKEFILE $APACHE_FAST_OUTPUT_FILES
 ])
 
-dnl ## APACHE_OUTPUT(file)
-dnl ## adds "file" to the list of files generated by AC_OUTPUT
-dnl ## This macro can be used several times.
-AC_DEFUN(APACHE_OUTPUT, [
-  APACHE_OUTPUT_FILES="$APACHE_OUTPUT_FILES $1"
-])
-
 dnl
 dnl APACHE_TYPE_RLIM_T
 dnl
 dnl If rlim_t is not defined, define it to int
 dnl
-AC_DEFUN(APACHE_TYPE_RLIM_T, [
+AC_DEFUN([APACHE_TYPE_RLIM_T], [
   AC_CACHE_CHECK([for rlim_t], ac_cv_type_rlim_t, [
     AC_TRY_COMPILE([
 #include <sys/types.h>
@@ -156,7 +153,7 @@ dnl prefix, i.e. MOD_CFLAGS etc.). Used in APACHE_MODPATH_{INIT,FINISH}.
 define(mod_buildvars, [CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS INCLUDES])
 dnl
 dnl APACHE_MODPATH_INIT(modpath)
-AC_DEFUN(APACHE_MODPATH_INIT,[
+AC_DEFUN([APACHE_MODPATH_INIT],[
   current_dir=$1
   modpath_current=modules/$1
   modpath_static=
@@ -168,7 +165,7 @@ AC_DEFUN(APACHE_MODPATH_INIT,[
   > $modpath_current/modules.mk
 ])dnl
 dnl
-AC_DEFUN(APACHE_MODPATH_FINISH,[
+AC_DEFUN([APACHE_MODPATH_FINISH],[
   echo "DISTCLEAN_TARGETS = modules.mk" >> $modpath_current/modules.mk
   echo "static = $modpath_static" >> $modpath_current/modules.mk
   echo "shared = $modpath_shared" >> $modpath_current/modules.mk
@@ -186,7 +183,7 @@ AC_DEFUN(APACHE_MODPATH_FINISH,[
 ])dnl
 dnl
 dnl APACHE_MODPATH_ADD(name[, shared[, objects [, ldflags[, libs]]]])
-AC_DEFUN(APACHE_MODPATH_ADD,[
+AC_DEFUN([APACHE_MODPATH_ADD],[
   if test -z "$3"; then
     objects="mod_$1.lo"
   else
@@ -220,7 +217,7 @@ EOF
 ])dnl
 dnl Same as APACHE_MODPATH_INIT/FINISH but for MPMs
 dnl APACHE_MPMPATH_INIT(mpmpath)
-AC_DEFUN(APACHE_MPMPATH_INIT,[
+AC_DEFUN([APACHE_MPMPATH_INIT],[
   current_dir=$1
   modpath_current=server/mpm/$1
   modpath_static=
@@ -232,7 +229,7 @@ AC_DEFUN(APACHE_MPMPATH_INIT,[
   > $modpath_current/modules.mk
 ])dnl
 dnl
-AC_DEFUN(APACHE_MPMPATH_FINISH,[
+AC_DEFUN([APACHE_MPMPATH_FINISH],[
   for var in mod_buildvars; do
     if eval val=\"\$MOD_$var\"; test -n "$val"; then
       echo "MOD_$var = $val" >> $modpath_current/modules.mk
@@ -253,7 +250,7 @@ dnl config   -- configuration logic to run if the MPM is enabled
 dnl path     -- relative path to MPM (default: server/mpm/mpmname)
 dnl libs     -- libs needed by this MPM
 dnl
-AC_DEFUN(APACHE_MPM_MODULE,[
+AC_DEFUN([APACHE_MPM_MODULE],[
     if ap_mpm_is_enabled $1; then
         if test -z "$3"; then
             objects="$1.lo"
@@ -293,10 +290,10 @@ DISTCLEAN_TARGETS = modules.mk
 static =
 shared = $libname
 EOF
-            DSO_MODULES="$DSO_MODULES mpm_$1"
+            MPM_MODULES="$MPM_MODULES mpm_$1"
             # add default MPM to LoadModule list
             if test $1 = $default_mpm; then
-                ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},mpm_$1"
+                ENABLED_MPM_MODULE="mpm_$1"
             fi
         fi
         $4
@@ -330,7 +327,7 @@ dnl   current module.
 dnl   prereq_module's APACHE_MODULE() statement must have been processed
 dnl   before the current APACHE_MODULE() statement.
 dnl
-AC_DEFUN(APACHE_MODULE,[
+AC_DEFUN([APACHE_MODULE],[
   AC_MSG_CHECKING(whether to enable mod_$1)
   define([optname],[--]ifelse($5,yes,disable,enable)[-]translit($1,_,-))dnl
   AC_ARG_ENABLE(translit($1,_,-),APACHE_HELP_STRING(optname(),$2),force_$1=$enableval,enable_$1=ifelse($5,,maybe-all,$5))
@@ -346,20 +343,29 @@ AC_DEFUN(APACHE_MODULE,[
       _apmod_required="no"
       ;;
   esac
-  if test "$enable_$1" = "static"; then
-    enable_$1=static
+  if test "$enable_$1" = "static" -o "$enable_$1" = "shared"; then
+    :
   elif test "$enable_$1" = "yes"; then
     enable_$1=$module_default
+  elif test "$enable_$1" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_$1=$module_default
+    else
+      enable_$1=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_$1" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_$1=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_$1=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_$1" = "maybe-all"; then
+  elif test "$enable_$1" = "all" -o "$enable_$1" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_$1=$module_default
@@ -367,23 +373,29 @@ AC_DEFUN(APACHE_MODULE,[
     else
       enable_$1=no
     fi
-  elif test "$enable_$1" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_$1" != "no" ; then
+  elif test "$enable_$1" = "reallyall" -o "$enable_$1" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_$1" != "no" ; then
       enable_$1=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_$1=no
+    fi
+  else
+    enable_$1=no
   fi
   if test "$enable_$1" != "no"; then
     dnl If we plan to enable it, allow the module to run some autoconf magic
     dnl that may disable it because of missing dependencies.
     ifelse([$6$7],,:,
            [AC_MSG_RESULT([checking dependencies])
-            ifelse([$7],,:,[if test "$enable_$7" = "no" ; then
-                              enable_$1=no
-                              AC_MSG_WARN("mod_$7 is disabled but required for mod_$1")
-                            elif test "$enable_$1" = "static" && test "$enable_$7" != "static" ; then
+            ifelse([$7],,:,[m4_foreach([prereq],[$7],
+                           [if test "$enable_[]prereq" = "no" ; then
                               enable_$1=no
-                              AC_MSG_WARN("cannot build mod_$1 statically if mod_$7 is built shared")
-                            else])
+                              AC_MSG_WARN("mod_[]prereq is disabled but required for mod_$1")
+                            elif test "$enable_$1" = "static" && test "$enable_[]prereq" != "static" ; then
+                              enable_$1=$enable_[]prereq
+                              AC_MSG_WARN("building mod_$1 shared because mod_[]prereq is built shared")
+                            el])se])
             ifelse([$6],,:,[  $6])
             ifelse([$7],,:,[fi])
             AC_MSG_CHECKING(whether to enable mod_$1)
@@ -405,7 +417,6 @@ AC_DEFUN(APACHE_MODULE,[
       fi
       shared="";;
     *)
-      enable_$1=`echo $enable_$1|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES $1"
@@ -424,7 +435,7 @@ AC_DEFUN(APACHE_MODULE,[
 dnl
 dnl APACHE_ENABLE_MODULES
 dnl
-AC_DEFUN(APACHE_ENABLE_MODULES,[
+AC_DEFUN([APACHE_ENABLE_MODULES],[
   module_selection=most
   module_default=shared
 
@@ -484,7 +495,7 @@ AC_DEFUN(APACHE_ENABLE_MODULES,[
   ])
 ])
 
-AC_DEFUN(APACHE_REQUIRE_CXX,[
+AC_DEFUN([APACHE_REQUIRE_CXX],[
   if test -z "$apache_cxx_done"; then
     AC_PROG_CXX
     AC_PROG_CXXCPP
@@ -498,13 +509,15 @@ dnl
 dnl Configure for OpenSSL, giving preference to
 dnl "--with-ssl=<path>" if it was specified.
 dnl
-AC_DEFUN(APACHE_CHECK_OPENSSL,[
+AC_DEFUN([APACHE_CHECK_OPENSSL],[
   AC_CACHE_CHECK([for OpenSSL], [ac_cv_openssl], [
     dnl initialise the variables we use
     ac_cv_openssl=no
     ap_openssl_found=""
     ap_openssl_base=""
     ap_openssl_libs=""
+    ap_openssl_mod_cflags=""
+    ap_openssl_mod_ldflags=""
 
     dnl Determine the OpenSSL base directory, if any
     AC_MSG_CHECKING([for user-provided OpenSSL base directory])
@@ -594,8 +607,9 @@ AC_DEFUN(APACHE_CHECK_OPENSSL,[
       dnl Run library and function checks
       liberrors=""
       AC_CHECK_HEADERS([openssl/engine.h])
-      AC_CHECK_FUNCS([SSLeay_version SSL_CTX_new], [], [liberrors="yes"])
-      AC_CHECK_FUNCS([ENGINE_init ENGINE_load_builtin_engines RAND_egd])
+      AC_CHECK_FUNCS([SSL_CTX_new], [], [liberrors="yes"])
+      AC_CHECK_FUNCS([ENGINE_init ENGINE_load_builtin_engines RAND_egd \
+                      CRYPTO_set_id_callback])
       if test "x$liberrors" != "x"; then
         AC_MSG_WARN([OpenSSL libraries are unusable])
       fi
@@ -607,9 +621,154 @@ AC_DEFUN(APACHE_CHECK_OPENSSL,[
     CPPFLAGS="$saved_CPPFLAGS"
     LIBS="$saved_LIBS"
     LDFLAGS="$saved_LDFLAGS"
+
+    dnl cache MOD_LDFLAGS, MOD_CFLAGS
+    ap_openssl_mod_cflags=$MOD_CFLAGS
+    ap_openssl_mod_ldflags=$MOD_LDFLAGS
   ])
   if test "x$ac_cv_openssl" = "xyes"; then
     AC_DEFINE(HAVE_OPENSSL, 1, [Define if OpenSSL is available])
+    APR_ADDTO(MOD_LDFLAGS, [$ap_openssl_mod_ldflags])
+    APR_ADDTO(MOD_CFLAGS, [$ap_openssl_mod_cflags])
+  fi
+
+  dnl On most platforms, the default multithreading logic in OpenSSL 1.0.x uses
+  dnl a threadid that is based on the address of errno. We need to double-check
+  dnl that &errno is, in fact, different for each thread before using that
+  dnl default.
+  AC_CACHE_CHECK([if OpenSSL can use &errno as a THREADID],
+                 [ac_cv_openssl_use_errno_threadid], [
+    ac_cv_openssl_use_errno_threadid=no
+
+    save_CFLAGS=$CFLAGS
+    save_LIBS=$LIBS
+
+    CFLAGS=`$apr_config --cflags --cppflags --includes`
+    LIBS=`$apr_config --link-ld`
+
+    AC_RUN_IFELSE([
+      AC_LANG_PROGRAM([[
+          #include <stdlib.h>
+
+          #include "apr_pools.h"
+          #include "apr_thread_cond.h"
+          #include "apr_thread_proc.h"
+
+          #define NUM_THREADS 10
+
+          struct thread_data {
+              apr_thread_mutex_t *mutex;
+              apr_thread_cond_t  *cv;
+              int                *init_count;
+              void               *errno_addr;
+          };
+
+          /**
+           * Thread entry point. Waits for all the threads to be started, then
+           * records the address of errno into the thread_data.
+           */
+          void * APR_THREAD_FUNC tmain(apr_thread_t *thread, void *data)
+          {
+              struct thread_data *tdata = data;
+
+              /* The only point of this barrier is to make sure that all threads
+               * are started before we record &errno, hopefully preventing any
+               * false negatives in case a platform "recycles" threads. */
+              apr_thread_mutex_lock(tdata->mutex);
+              ++(*tdata->init_count);
+
+              if (*tdata->init_count == NUM_THREADS) {
+                  apr_thread_cond_broadcast(tdata->cv);
+              } else {
+                  while (*tdata->init_count != NUM_THREADS) {
+                      apr_thread_cond_wait(tdata->cv, tdata->mutex);
+                  }
+              }
+              apr_thread_mutex_unlock(tdata->mutex);
+
+              tdata->errno_addr = &errno;
+              return NULL;
+          }
+      ]], [[
+          int ret = 0;
+          apr_status_t status;
+          int i;
+          int j;
+
+          apr_pool_t         *pool;
+          apr_thread_mutex_t *mutex;
+          apr_thread_cond_t  *cv;
+          int                init_count = 0;
+
+          struct thread_data tdata[NUM_THREADS] = { 0 };
+          apr_thread_t *threads[NUM_THREADS] = { 0 };
+
+          if (apr_initialize() != APR_SUCCESS) {
+              exit(1);
+          }
+
+          /* Set up the shared APR primitives. */
+          if ((apr_pool_create(&pool, NULL) != APR_SUCCESS)
+              || (apr_thread_mutex_create(&mutex, 0, pool) != APR_SUCCESS)
+              || (apr_thread_cond_create(&cv, pool) != APR_SUCCESS)) {
+              ret = 2;
+              goto out;
+          }
+
+          /* Start every thread. */
+          for (i = 0; i < NUM_THREADS; ++i) {
+              tdata[i].mutex = mutex;
+              tdata[i].cv = cv;
+              tdata[i].init_count = &init_count;
+
+              status = apr_thread_create(&threads[i], NULL, tmain, &tdata[i],
+                                         pool);
+              if (status != APR_SUCCESS) {
+                  ret = 3;
+                  goto out;
+              }
+          }
+
+          /* Wait for them to finish (they'll record and exit after every one
+           * has been started). */
+          for (i = 0; i < NUM_THREADS; ++i) {
+              apr_thread_join(&status, threads[i]);
+              if (status != APR_SUCCESS) {
+                  ret = 4;
+                  goto out;
+              }
+          }
+
+          /* Check that no addresses were duplicated. */
+          for (i = 0; i < NUM_THREADS - 1; ++i) {
+              for (j = i + 1; j < NUM_THREADS; ++j) {
+                  if (tdata[i].errno_addr == tdata[j].errno_addr) {
+                      ret = 5;
+                      goto out;
+                  }
+              }
+          }
+
+      out:
+          apr_terminate();
+          exit(ret);
+      ]])
+    ], [
+      ac_cv_openssl_use_errno_threadid=yes
+    ], [
+      ac_cv_openssl_use_errno_threadid=no
+    ], [
+      dnl Assume the worst when cross-compiling; users can override via either
+      dnl cachevars or the config header if necessary.
+      ac_cv_openssl_use_errno_threadid=no
+    ])
+
+    CFLAGS=$save_CFLAGS
+    LIBS=$save_LIBS
+  ])
+  if test "x$ac_cv_openssl_use_errno_threadid" = "xyes"; then
+    AC_DEFINE(AP_OPENSSL_USE_ERRNO_THREADID, 1,
+              [Define if OpenSSL can use an errno-based threadid callback on this platform])
   fi
 ])
 
@@ -654,7 +813,7 @@ AC_DEFUN([APACHE_CHECK_SERF], [
   fi
 ])
 
-AC_DEFUN(APACHE_CHECK_SYSTEMD, [
+AC_DEFUN([APACHE_CHECK_SYSTEMD], [
 dnl Check for systemd support for listen.c's socket activation.
 case $host in
 *-linux-*)
@@ -678,141 +837,20 @@ case $host in
 esac
 ])
 
-dnl
-dnl APACHE_CHECK_NGHTTP2
-dnl
-dnl Configure for nghttp2, giving preference to
-dnl "--with-nghttp2=<path>" if it was specified.
-dnl
-AC_DEFUN(APACHE_CHECK_NGHTTP2,[
-  AC_CACHE_CHECK([for nghttp2], [ac_cv_nghttp2], [
-    dnl initialise the variables we use
-    ac_cv_nghttp2=no
-    ap_nghttp2_found=""
-    ap_nghttp2_base=""
-    ap_nghttp2_libs=""
-
-    dnl Determine the nghttp2 base directory, if any
-    AC_MSG_CHECKING([for user-provided nghttp2 base directory])
-    AC_ARG_WITH(nghttp2, APACHE_HELP_STRING(--with-nghttp2=PATH, nghttp2 installation directory), [
-      dnl If --with-nghttp2 specifies a directory, we use that directory
-      if test "x$withval" != "xyes" -a "x$withval" != "x"; then
-        dnl This ensures $withval is actually a directory and that it is absolute
-        ap_nghttp2_base="`cd $withval ; pwd`"
-      fi
-    ])
-    if test "x$ap_nghttp2_base" = "x"; then
-      AC_MSG_RESULT(none)
-    else
-      AC_MSG_RESULT($ap_nghttp2_base)
-    fi
-
-    dnl Run header and version checks
-    saved_CPPFLAGS="$CPPFLAGS"
-    saved_LIBS="$LIBS"
-    saved_LDFLAGS="$LDFLAGS"
-
-    dnl Before doing anything else, load in pkg-config variables
-    if test -n "$PKGCONFIG"; then
-      saved_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
-      AC_MSG_CHECKING([for pkg-config along $PKG_CONFIG_PATH])
-      if test "x$ap_nghttp2_base" != "x" -a \
-              -f "${ap_nghttp2_base}/lib/pkgconfig/libnghttp2.pc"; then
-        dnl Ensure that the given path is used by pkg-config too, otherwise
-        dnl the system libnghttp2.pc might be picked up instead.
-        PKG_CONFIG_PATH="${ap_nghttp2_base}/lib/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}"
-        export PKG_CONFIG_PATH
-      fi
-      AC_ARG_ENABLE(nghttp2-staticlib-deps,APACHE_HELP_STRING(--enable-nghttp2-staticlib-deps,[link mod_h2 with dependencies of libnghttp2's static libraries (as indicated by "pkg-config --static"). Must be specified in addition to --enable-h2.]), [
-        if test "$enableval" = "yes"; then
-          PKGCONFIG_LIBOPTS="--static"
-        fi
-      ])
-      ap_nghttp2_libs="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-l --silence-errors libnghttp2`"
-      if test $? -eq 0; then
-        ap_nghttp2_found="yes"
-        pkglookup="`$PKGCONFIG --cflags-only-I libnghttp2`"
-        APR_ADDTO(CPPFLAGS, [$pkglookup])
-        APR_ADDTO(MOD_CFLAGS, [$pkglookup])
-        APR_ADDTO(ab_CFLAGS, [$pkglookup])
-        pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-L libnghttp2`"
-        APR_ADDTO(LDFLAGS, [$pkglookup])
-        APR_ADDTO(MOD_LDFLAGS, [$pkglookup])
-        pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-other libnghttp2`"
-        APR_ADDTO(LDFLAGS, [$pkglookup])
-        APR_ADDTO(MOD_LDFLAGS, [$pkglookup])
-      fi
-      PKG_CONFIG_PATH="$saved_PKG_CONFIG_PATH"
-    fi
-
-    dnl fall back to the user-supplied directory if not found via pkg-config
-    if test "x$ap_nghttp2_base" != "x" -a "x$ap_nghttp2_found" = "x"; then
-      APR_ADDTO(CPPFLAGS, [-I$ap_nghttp2_base/include])
-      APR_ADDTO(MOD_CFLAGS, [-I$ap_nghttp2_base/include])
-      APR_ADDTO(ab_CFLAGS, [-I$ap_nghttp2_base/include])
-      APR_ADDTO(LDFLAGS, [-L$ap_nghttp2_base/lib])
-      APR_ADDTO(MOD_LDFLAGS, [-L$ap_nghttp2_base/lib])
-      if test "x$ap_platform_runtime_link_flag" != "x"; then
-        APR_ADDTO(LDFLAGS, [$ap_platform_runtime_link_flag$ap_nghttp2_base/lib])
-        APR_ADDTO(MOD_LDFLAGS, [$ap_platform_runtime_link_flag$ap_nghttp2_base/lib])
-      fi
-    fi
-
-    AC_MSG_CHECKING([for nghttp2 version >= 1.0.0])
-    AC_TRY_COMPILE([#include <nghttp2/nghttp2ver.h>],[
-#if !defined(NGHTTP2_VERSION_NUM)
-#error "Missing nghttp2 version"
-#endif
-#if NGHTTP2_VERSION_NUM < 0x010000
-#error "Unsupported nghttp2 version " NGHTTP2_VERSION_TEXT
-#endif],
-      [AC_MSG_RESULT(OK)
-       ac_cv_nghttp2=yes],
-      [AC_MSG_RESULT(FAILED)])
-
-    if test "x$ac_cv_nghttp2" = "xyes"; then
-      ap_nghttp2_libs="${ap_nghttp2_libs:--lnghttp2} `$apr_config --libs`"
-      APR_ADDTO(MOD_LDFLAGS, [$ap_nghttp2_libs])
-      APR_ADDTO(LIBS, [$ap_nghttp2_libs])
-      APR_SETVAR(ab_LDFLAGS, [$MOD_LDFLAGS])
-      APACHE_SUBST(ab_CFLAGS)
-      APACHE_SUBST(ab_LDFLAGS)
-
-      dnl Run library and function checks
-      liberrors=""
-      AC_CHECK_HEADERS([nghttp2/nghttp2.h])
-      AC_CHECK_FUNCS([nghttp2_session_server_new2], [], [liberrors="yes"])
-      if test "x$liberrors" != "x"; then
-        AC_MSG_WARN([nghttp2 library is unusable])
-      fi
-    else
-      AC_MSG_WARN([nghttp2 version is too old])
-    fi
-
-    dnl restore
-    CPPFLAGS="$saved_CPPFLAGS"
-    LIBS="$saved_LIBS"
-    LDFLAGS="$saved_LDFLAGS"
-  ])
-  if test "x$ac_cv_nghttp2" = "xyes"; then
-    AC_DEFINE(HAVE_NGHTTP2, 1, [Define if nghttp2 is available])
-  fi
-])
-
 dnl
 dnl APACHE_EXPORT_ARGUMENTS
 dnl Export (via APACHE_SUBST) the various path-related variables that
 dnl apache will use while generating scripts like autoconf and apxs and
 dnl the default config file.
 
-AC_DEFUN(APACHE_SUBST_EXPANDED_ARG,[
+AC_DEFUN([APACHE_SUBST_EXPANDED_ARG],[
   APR_EXPAND_VAR(exp_$1, [$]$1)
   APACHE_SUBST(exp_$1)
   APR_PATH_RELATIVE(rel_$1, [$]exp_$1, ${prefix})
   APACHE_SUBST(rel_$1)
 ])
 
-AC_DEFUN(APACHE_EXPORT_ARGUMENTS,[
+AC_DEFUN([APACHE_EXPORT_ARGUMENTS],[
   APACHE_SUBST_EXPANDED_ARG(exec_prefix)
   APACHE_SUBST_EXPANDED_ARG(bindir)
   APACHE_SUBST_EXPANDED_ARG(sbindir)
@@ -930,7 +968,7 @@ AC_DEFUN([APACHE_ADD_GCC_CFLAG], [
     AC_CACHE_CHECK([whether gcc accepts $1], ap_gcc_ckvar, [
       save_CFLAGS="$CFLAGS"
       CFLAGS="$CFLAGS $1"
-      AC_COMPILE_IFELSE([AC_LANG_SOURCE([int foo() { return 0; }])],
+      AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
         [ap_gcc_ckvar=yes], [ap_gcc_ckvar=no])
       CFLAGS="$save_CFLAGS"
     ])