Merge r1706918 from trunk:

m4: please any autoconf by quoting AC_DEFUN's names. PR 58126.

Submitted by: olli hauer <ohauer gmx.de>

Submitted by: ylavic
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707038 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 15eb489a0b34773bbc8633e75dc9687bf8a8a2f9..c2741412fb1b149b7bc2a05be672624b1c9d1f54 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -110,11 +110,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * Fix some m4's AC_DEFUN quoting. PR 58126.
-     trunk patch: http://svn.apache.org/r1706918
-     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-AC_DEFUN_quotes.patch
-     +1: ylavic, jim, rjung
-
    * mod_substitute: Configure patterns merge order. PR 57641
      trunk patch: http://svn.apache.org/r1684900
                   http://svn.apache.org/r1687539 

diff --git a/acinclude.m4 b/acinclude.m4
index 5cac96bc24cbdcbc40fbd4ea9454a405a1548500..7ee0ad20a3beb8176bce3f5e05c7c835542334d1 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -4,25 +4,25 @@ 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)
@@ -114,14 +114,14 @@ 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, [
+AC_DEFUN([APACHE_OUTPUT], [
   APACHE_OUTPUT_FILES="$APACHE_OUTPUT_FILES $1"
 ])
 
@@ -130,7 +130,7 @@ 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>
@@ -153,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=
@@ -165,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
@@ -183,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
@@ -229,7 +229,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"
@@ -306,7 +306,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))
@@ -407,7 +407,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
 
@@ -467,7 +467,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
@@ -481,7 +481,7 @@ 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
@@ -602,14 +602,14 @@ 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)

diff --git a/modules/cache/config.m4 b/modules/cache/config.m4
index b9799b76d9a278df82e4aa1d5fd099b81706af02..8115094dadee6e0e27b05626868fb89408963678 100644 (file)
--- a/modules/cache/config.m4
+++ b/modules/cache/config.m4
@@ -34,7 +34,7 @@ dnl
 dnl Configure for the detected distcache installation, giving
 dnl preference to "--with-distcache=<path>" if it was specified.
 dnl
-AC_DEFUN(APACHE_CHECK_DISTCACHE,[
+AC_DEFUN([APACHE_CHECK_DISTCACHE],[
 if test "x$ap_distcache_configured" = "x"; then
   dnl initialise the variables we use
   ap_distcache_found=""

diff --git a/modules/filters/config.m4 b/modules/filters/config.m4
index abcec1bdf720610fd13019b565a93fdfeaeb303a..60917edadb7270ec63f482bfed72fbd3cecc3fcb 100644 (file)
--- a/modules/filters/config.m4
+++ b/modules/filters/config.m4
@@ -96,7 +96,7 @@ APACHE_MODULE(deflate, Deflate transfer encoding support, , , most, [
   fi
 ])
 
-AC_DEFUN(FIND_LIBXML2, [
+AC_DEFUN([FIND_LIBXML2], [
   AC_CACHE_CHECK([for libxml2], [ac_cv_libxml2], [
     AC_ARG_WITH(libxml2,
       [APACHE_HELP_STRING(--with-libxml2=PATH,location for libxml2)],

diff --git a/modules/http2/config.m4 b/modules/http2/config.m4
index 46d4e50b548009398416467db0606b2ea825804a..9c5eb86740e9a30820a34515be0e7356e79eab50 100644 (file)
--- a/modules/http2/config.m4
+++ b/modules/http2/config.m4
@@ -51,7 +51,7 @@ dnl
 dnl Configure for nghttp2, giving preference to
 dnl "--with-nghttp2=<path>" if it was specified.
 dnl
-AC_DEFUN(APACHE_CHECK_NGHTTP2,[
+AC_DEFUN([APACHE_CHECK_NGHTTP2],[
   AC_CACHE_CHECK([for nghttp2], [ac_cv_nghttp2], [
     dnl initialise the variables we use
     ac_cv_nghttp2=no

diff --git a/server/mpm/config.m4 b/server/mpm/config.m4
index 07118bd904613a15b44ca8d29be684c28a3c2107..6d3ab86b7376671523bbcabd5de58d6b9858cf83 100644 (file)
--- a/server/mpm/config.m4
+++ b/server/mpm/config.m4
@@ -60,7 +60,7 @@ case $host in
 esac
 
 dnl APACHE_MPM_SUPPORTED(name, supports-shared, is_threaded)
-AC_DEFUN(APACHE_MPM_SUPPORTED,[
+AC_DEFUN([APACHE_MPM_SUPPORTED],[
     if test "$2" = "yes"; then
         eval "ap_supported_mpm_$1=shared"
         ap_supported_shared_mpms="$ap_supported_shared_mpms $1 "
@@ -73,7 +73,7 @@ AC_DEFUN(APACHE_MPM_SUPPORTED,[
 ])dnl
 
 dnl APACHE_MPM_ENABLED(name)
-AC_DEFUN(APACHE_MPM_ENABLED,[
+AC_DEFUN([APACHE_MPM_ENABLED],[
     if ap_mpm_is_enabled $1; then
         :
     else