[patch] [patch] branches/2.4.x/acinclude.m4

acinclude.m4-2.4.x.diff (text/plain), 4.79 KB, created by ohauer on 2015-07-11 21:05:13 UTC

(hide)

Description: [patch] branches/2.4.x/acinclude.m4

Filename:

MIME Type:

Creator: ohauer

Created: 2015-07-11 21:05:13 UTC

Size: 4.79 KB

patch

obsolete

>Index: branches/2.4.x/acinclude.m4 >=================================================================== >--- branches/2.4.x/acinclude.m4 (revision 1690272) >+++ branches/2.4.x/acinclude.m4 (working copy) >@@ -4,12 +4,12 @@ > 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) > ]) >@@ -16,13 +16,13 @@ > > 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(abs_srcdir) > APACHE_SUBST(bindir) > APACHE_SUBST(sbindir) >@@ -112,7 +112,7 @@ > > 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 > ]) > >@@ -119,7 +119,7 @@ > 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" > ]) > >@@ -128,7 +128,7 @@ > 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> >@@ -151,7 +151,7 @@ > 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= >@@ -163,7 +163,7 @@ > > $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 >@@ -181,7 +181,7 @@ > ])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 >@@ -227,7 +227,7 @@ > 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" >@@ -304,7 +304,7 @@ > 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)) >@@ -405,7 +405,7 @@ > dnl > dnl APACHE_ENABLE_MODULES > dnl >-AC_DEFUN(APACHE_ENABLE_MODULES,[ >+AC_DEFUN([APACHE_ENABLE_MODULES],[ > module_selection=most > module_default=shared > >@@ -465,7 +465,7 @@ > ]) > ]) > >-AC_DEFUN(APACHE_REQUIRE_CXX,[ >+AC_DEFUN([APACHE_REQUIRE_CXX],[ > if test -z "$apache_cxx_done"; then > AC_PROG_CXX > AC_PROG_CXXCPP >@@ -479,7 +479,7 @@ > 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 >@@ -600,7 +600,7 @@ > 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}) >@@ -607,7 +607,7 @@ > 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) View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]