diff options
| -rw-r--r-- | acinclude.m4 | 40 | ||||
| -rw-r--r-- | modules/cache/config.m4 | 2 | ||||
| -rw-r--r-- | modules/filters/config.m4 | 2 | ||||
| -rw-r--r-- | modules/http2/config.m4 | 2 | ||||
| -rw-r--r-- | server/mpm/config.m4 | 4 |
5 files changed, 25 insertions, 25 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index f4d34e044c..2ff36f2ed8 100644 --- 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) @@ -119,14 +119,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" ]) @@ -135,7 +135,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> @@ -158,7 +158,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= @@ -170,7 +170,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 @@ -188,7 +188,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 @@ -222,7 +222,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= @@ -234,7 +234,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 @@ -255,7 +255,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" @@ -332,7 +332,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)) @@ -426,7 +426,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 @@ -486,7 +486,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 @@ -500,7 +500,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 @@ -656,7 +656,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-*) @@ -686,14 +686,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 b9799b76d9..8115094dad 100644 --- 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 abcec1bdf7..60917edadb 100644 --- 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 46d4e50b54..9c5eb86740 100644 --- 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 07118bd904..6d3ab86b73 100644 --- 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 |