- Quote macro names in AC_DEFUN()

# Fixes also bug #29160
# for i in `grep -r -l AC_DEFUN *`; do perl -i -pe "s#AC_DEFUN\(([^\[])(.*)\,#AC_DEFUN([\1\2],#g" $i; done;

diff --git a/TSRM/acinclude.m4 b/TSRM/acinclude.m4
index 1953172aef48cb18c50390a498523de9de3f65cd..fcf97fd352ee0b5e6f6810bc6fc3e5b34119c0ba 100644 (file)
--- a/TSRM/acinclude.m4
+++ b/TSRM/acinclude.m4
@@ -1,5 +1,5 @@
 
-AC_DEFUN(AM_SET_LIBTOOL_VARIABLE,[
+AC_DEFUN([AM_SET_LIBTOOL_VARIABLE],[
   LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
 ])
 

diff --git a/TSRM/threads.m4 b/TSRM/threads.m4
index 790579656e86b0f42ccfad542e99e24ebe5d3b6e..e2ae7a10338b05250bdb4bf655997c0ef1b0bc42 100644 (file)
--- a/TSRM/threads.m4
+++ b/TSRM/threads.m4
@@ -30,7 +30,7 @@ dnl PTHREADS_FLAGS
 dnl
 dnl Set some magic defines to achieve POSIX threads conformance
 dnl
-AC_DEFUN(PTHREADS_FLAGS,[
+AC_DEFUN([PTHREADS_FLAGS],[
   if test -z "$host_alias" && test -n "$host"; then
     host_alias=$host
   fi
@@ -65,7 +65,7 @@ dnl PTHREADS_CHECK_COMPILE
 dnl
 dnl Check whether the current setup can use POSIX threads calls
 dnl
-AC_DEFUN(PTHREADS_CHECK_COMPILE, [
+AC_DEFUN([PTHREADS_CHECK_COMPILE], [
 AC_TRY_RUN( [
 #include <pthread.h>
 #include <stddef.h>
@@ -100,7 +100,7 @@ dnl  -pthreads         gcc (Solaris)
 dnl  -qthreaded        AIX cc V5
 dnl  -threads          gcc (HP-UX)
 dnl
-AC_DEFUN(PTHREADS_CHECK,[
+AC_DEFUN([PTHREADS_CHECK],[
 
 if test "$beos_threads" = "1"; then
   pthreads_working="yes"
@@ -154,7 +154,7 @@ fi
 ])dnl
 dnl
 dnl
-AC_DEFUN(PTHREADS_ASSIGN_VARS,[
+AC_DEFUN([PTHREADS_ASSIGN_VARS],[
 if test -n "$ac_cv_pthreads_lib"; then
   LIBS="$LIBS -l$ac_cv_pthreads_lib"
 fi

diff --git a/TSRM/tsrm.m4 b/TSRM/tsrm.m4
index 291b7f2e4ef433c3828367606caea7b8c214835e..a06c2a694d55d3cf1c84a1f6464eecaf7aaaac4a 100644 (file)
--- a/TSRM/tsrm.m4
+++ b/TSRM/tsrm.m4
@@ -1,6 +1,6 @@
 
 dnl TSRM_CHECK_GCC_ARG(ARG, ACTION-IF-FOUND, ACTION-IF-NOT_FOUND)      
-AC_DEFUN(TSRM_CHECK_GCC_ARG,[
+AC_DEFUN([TSRM_CHECK_GCC_ARG],[
   gcc_arg_name=[ac_cv_gcc_arg]translit($1,A-Z-,a-z_)
   AC_CACHE_CHECK([whether $CC supports $1], [ac_cv_gcc_arg]translit($1,A-Z-,a-z_), [
   echo 'void somefunc() { };' > conftest.c
@@ -21,7 +21,7 @@ AC_DEFUN(TSRM_CHECK_GCC_ARG,[
   fi
 ])
 
-AC_DEFUN(TSRM_BASIC_CHECKS,[
+AC_DEFUN([TSRM_BASIC_CHECKS],[
 
 AC_REQUIRE([AC_PROG_CC])dnl
 dnl AC_REQUIRE([AM_PROG_CC_STDC])dnl
@@ -33,7 +33,7 @@ AC_CHECK_HEADERS(stdarg.h)
 ])
 
 
-AC_DEFUN(TSRM_CHECK_PTH,[
+AC_DEFUN([TSRM_CHECK_PTH],[
 
 AC_MSG_CHECKING(for GNU Pth)
 PTH_PREFIX="`$1 --prefix`"
@@ -50,7 +50,7 @@ AC_MSG_RESULT(yes - installed in $PTH_PREFIX)
 
 ])
 
-AC_DEFUN(TSRM_CHECK_ST,[
+AC_DEFUN([TSRM_CHECK_ST],[
   if test -r "$1/include/st.h"; then
     CPPFLAGS="$CPPFLAGS -I$1/include"
     LDFLAGS="$LDFLAGS -L$1/lib"
@@ -70,7 +70,7 @@ AC_DEFUN(TSRM_CHECK_ST,[
 sinclude(threads.m4)
 sinclude(TSRM/threads.m4)
 
-AC_DEFUN(TSRM_CHECK_PTHREADS,[
+AC_DEFUN([TSRM_CHECK_PTHREADS],[
                
 PTHREADS_CHECK
 
@@ -89,7 +89,7 @@ fi
 ])
 
 
-AC_DEFUN(TSRM_THREADS_CHECKS,[
+AC_DEFUN([TSRM_THREADS_CHECKS],[
 
 dnl For the thread implementations, we always use --with-*
 dnl to maintain consistency

diff --git a/acinclude.m4 b/acinclude.m4
index 0e030319248722d7c1f3339e2fa0bf3a0b9502cd..3d2535a68bd7616c48c5b1ce3103cdd198fadc40 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -16,7 +16,7 @@ AC_DEFUN([PHP_ADD_MAKEFILE_FRAGMENT],[
   sed -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src  >> Makefile.fragments
 ])
 
-AC_DEFUN(PHP_PROG_RE2C,[
+AC_DEFUN([PHP_PROG_RE2C],[
   AC_CHECK_PROG(RE2C, re2c, re2c, [exit 0;])
 ])
 

diff --git a/configure.in b/configure.in
index c54220f40e7fce37e3797643a0dcf27acdbc97d2..6ffa70762eaee1319b8032ef344d34d984e98756 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -45,10 +45,10 @@ EXTRA_VERSION="-dev"
 VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
 
 dnl Define where extension directories are located in the configure context
-AC_DEFUN(PHP_EXT_BUILDDIR,[ext/$1])dnl
-AC_DEFUN(PHP_EXT_DIR,[ext/$1])dnl
-AC_DEFUN(PHP_EXT_SRCDIR,[$abs_srcdir/ext/$1])dnl
-AC_DEFUN(PHP_ALWAYS_SHARED,[])dnl
+AC_DEFUN([PHP_EXT_BUILDDIR],[ext/$1])dnl
+AC_DEFUN([PHP_EXT_DIR],[ext/$1])dnl
+AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir/ext/$1])dnl
+AC_DEFUN([PHP_ALWAYS_SHARED],[])dnl
 
 dnl Setting up the PHP version based on the information above.
 dnl -------------------------------------------------------------------------

diff --git a/ext/bcmath/libbcmath/aclocal.m4 b/ext/bcmath/libbcmath/aclocal.m4
index f23ba2904e17f5ce128893301a5f29aad9149aeb..e60c9eb55c7868fe06ca4ee82173b344772712e9 100644 (file)
--- a/ext/bcmath/libbcmath/aclocal.m4
+++ b/ext/bcmath/libbcmath/aclocal.m4
@@ -19,7 +19,7 @@ dnl PARTICULAR PURPOSE.
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN(AM_INIT_AUTOMAKE,
+AC_DEFUN([AM_INIT_AUTOMAKE],
 [AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
@@ -47,7 +47,7 @@ AC_REQUIRE([AC_PROG_MAKE_SET])])
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN(AM_SANITY_CHECK,
+AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -88,7 +88,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN(AM_MISSING_PROG,
+AC_DEFUN([AM_MISSING_PROG],
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -104,7 +104,7 @@ AC_SUBST($1)])
 
 # Like AC_CONFIG_HEADER, but automatically create stamp file.
 
-AC_DEFUN(AM_CONFIG_HEADER,
+AC_DEFUN([AM_CONFIG_HEADER],
 [AC_PREREQ([2.12])
 AC_CONFIG_HEADER([$1])
 dnl When config.status generates a header, we must update the stamp-h file.

diff --git a/ext/cpdf/config.m4 b/ext/cpdf/config.m4
index 4bb6bdd0c09ecbf7ea6d2a42a54b59c06fc19a18..1b53d700a5f97c395f952019b75176cd268a3f46 100644 (file)
--- a/ext/cpdf/config.m4
+++ b/ext/cpdf/config.m4
@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(CPDF_JPEG_TEST,[
+AC_DEFUN([CPDF_JPEG_TEST],[
   AC_ARG_WITH(jpeg-dir,
   [  --with-jpeg-dir[=DIR]     CPDF: Set the path to libjpeg install prefix.],[
     for i in $withval /usr/local /usr; do
@@ -22,7 +22,7 @@ AC_DEFUN(CPDF_JPEG_TEST,[
   ],)
 ])
 
-AC_DEFUN(CPDF_TIFF_TEST,[
+AC_DEFUN([CPDF_TIFF_TEST],[
   AC_ARG_WITH(tiff-dir,
   [  --with-tiff-dir[=DIR]     CPDF: Set the path to libtiff install prefix.],[
     for i in $withval /usr/local /usr; do

diff --git a/ext/db/config.m4 b/ext/db/config.m4
index 1b0626ce9a0f13a271ccedd2250a718cea74662e..f3070c72a9ddf3d406cdeb102746f710a559f7ca 100644 (file)
--- a/ext/db/config.m4
+++ b/ext/db/config.m4
@@ -4,7 +4,7 @@ dnl
 
 # Checks for libraries.
 # Prefer gdbm, Berkeley DB and ndbm/dbm, in that order
-AC_DEFUN(AC_PREFERRED_DB_LIB,[
+AC_DEFUN([AC_PREFERRED_DB_LIB],[
   AC_CHECK_LIB(gdbm, gdbm_open,[AC_DEFINE(GDBM,1, [Whether you have GDBM]) DBM_TYPE=gdbm; DBM_LIB=-lgdbm],
   [AC_CHECK_LIB(c, dbm_open,[AC_DEFINE(NDBM,1,[ ]) DBM_TYPE=ndbm; DBM_LIB=],
    [AC_CHECK_LIB(dbm, dbm_open,[AC_DEFINE(NDBM,1,[ ]) DBM_TYPE=ndbm; DBM_LIB=-ldbm],

diff --git a/ext/dba/config.m4 b/ext/dba/config.m4
index 3d34e1b39e2b48714b48c86efd5a4bd6e4234bc8..aa9a1ff3c038e577b31d33605a56cf7a005d819d 100644 (file)
--- a/ext/dba/config.m4
+++ b/ext/dba/config.m4
@@ -4,11 +4,11 @@ dnl
 
 dnl Suppose we need FlatFile if no support or only CDB is used.
 
-AC_DEFUN(PHP_DBA_STD_BEGIN,[
+AC_DEFUN([PHP_DBA_STD_BEGIN],[
   unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT
 ])
 
-AC_DEFUN(PHP_TEMP_LDFLAGS,[
+AC_DEFUN([PHP_TEMP_LDFLAGS],[
   old_LDFLAGS=$LDFLAGS
   LDFLAGS="$1 $LDFLAGS"
   old_LIBS=$LIBS
@@ -19,14 +19,14 @@ AC_DEFUN(PHP_TEMP_LDFLAGS,[
 ])
 
 dnl Assign INCLUDE/LFLAGS from PREFIX
-AC_DEFUN(PHP_DBA_STD_ASSIGN,[
+AC_DEFUN([PHP_DBA_STD_ASSIGN],[
   if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then
     THIS_LFLAGS=$THIS_PREFIX/lib
   fi
 ])
 
 dnl Standard check
-AC_DEFUN(PHP_DBA_STD_CHECK,[
+AC_DEFUN([PHP_DBA_STD_CHECK],[
   THIS_RESULT="yes"
   if test -z "$THIS_INCLUDE"; then
     AC_MSG_ERROR([DBA: Could not find necessary header file(s).])
@@ -37,14 +37,14 @@ AC_DEFUN(PHP_DBA_STD_CHECK,[
 ])
 
 dnl Attach THIS_x to DBA_x
-AC_DEFUN(PHP_DBA_STD_ATTACH,[
+AC_DEFUN([PHP_DBA_STD_ATTACH],[
   PHP_ADD_LIBRARY_WITH_PATH($THIS_LIBS, $THIS_LFLAGS, DBA_SHARED_LIBADD)
   unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX
 ])
 
 dnl Print the result message
 dnl parameters(name [, full name [, empty or error message]])
-AC_DEFUN(AC_DBA_STD_RESULT,[
+AC_DEFUN([AC_DBA_STD_RESULT],[
   THIS_NAME=[]translit($1,a-z0-9-,A-Z0-9_)
   if test -n "$2"; then
     THIS_FULL_NAME="$2"
@@ -134,7 +134,7 @@ AC_DBA_STD_RESULT(ndbm)
 
 dnl Berkeley specific (library and version test)
 dnl parameters(version, library list, function)
-AC_DEFUN(PHP_DBA_DB_CHECK,[
+AC_DEFUN([PHP_DBA_DB_CHECK],[
   for LIB in $2; do
     if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then
       PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib, -l$LIB,[
@@ -343,7 +343,7 @@ AC_ARG_WITH(dbm,
 ])
 AC_DBA_STD_RESULT(dbm)
 
-AC_DEFUN(PHP_DBA_BUILTIN_CDB,[
+AC_DEFUN([PHP_DBA_BUILTIN_CDB],[
   AC_DEFINE(DBA_CDB_BUILTIN, 1, [ ])
   AC_DEFINE(DBA_CDB_MAKE, 1, [ ])
   AC_DEFINE(DBA_CDB, 1, [ ])
@@ -389,7 +389,7 @@ AC_ARG_WITH(cdb,
 ])
 AC_DBA_STD_RESULT(cdb)
 
-AC_DEFUN(PHP_DBA_BUILTIN_INI,[
+AC_DEFUN([PHP_DBA_BUILTIN_INI],[
   AC_DEFINE(DBA_INIFILE, 1, [ ])
   ini_sources="libinifile/inifile.c"
   THIS_RESULT="builtin"
@@ -407,7 +407,7 @@ AC_ARG_WITH(inifile,
 ])
 AC_DBA_STD_RESULT(inifile,INI File)
 
-AC_DEFUN(PHP_DBA_BUILTIN_FLATFILE,[
+AC_DEFUN([PHP_DBA_BUILTIN_FLATFILE],[
   AC_DEFINE(DBA_FLATFILE, 1, [ ])
   flat_sources="libflatfile/flatfile.c"
   THIS_RESULT="builtin"

diff --git a/ext/domxml/config.m4 b/ext/domxml/config.m4
index 580690830297df72c6404ea6605a4fdf05fd70ff..f355863488b2a5311671627b84d96dac98580877 100644 (file)
--- a/ext/domxml/config.m4
+++ b/ext/domxml/config.m4
@@ -2,7 +2,7 @@ dnl
 dnl $Id$
 dnl
 
-AC_DEFUN(PHP_DOM_CHECK_VERSION,[
+AC_DEFUN([PHP_DOM_CHECK_VERSION],[
   old_CPPFLAGS=$CPPFLAGS
   CPPFLAGS=-I$DOMXML_DIR/include$DOMXML_DIR_ADD
   AC_MSG_CHECKING(for libxml version)
@@ -78,7 +78,7 @@ if test "$PHP_DOM" != "no"; then
   PHP_SUBST(DOMXML_SHARED_LIBADD)
 fi
 
-AC_DEFUN(PHP_DOM_XSLT_CHECK_VERSION,[
+AC_DEFUN([PHP_DOM_XSLT_CHECK_VERSION],[
   old_CPPFLAGS=$CPPFLAGS
   CPPFLAGS=-I$DOMXSLT_DIR/include
   AC_MSG_CHECKING(for libxslt version)
@@ -95,7 +95,7 @@ AC_DEFUN(PHP_DOM_XSLT_CHECK_VERSION,[
   CPPFLAGS=$old_CPPFLAGS
 ])
 
-AC_DEFUN(PHP_DOM_EXSLT_CHECK_VERSION,[
+AC_DEFUN([PHP_DOM_EXSLT_CHECK_VERSION],[
   old_CPPFLAGS=$CPPFLAGS
   CPPFLAGS=-I$DOMEXSLT_DIR/include
   AC_MSG_CHECKING(for libexslt version)

diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index 047df159c1445d577dbac73b7e92e7c33504895a..1534a46cac6c8d6d535f9fa6a405ca7d94c7bc1f 100644 (file)
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -47,7 +47,7 @@ dnl
 dnl Checks for the configure options 
 dnl 
 
-AC_DEFUN(PHP_GD_JPEG,[
+AC_DEFUN([PHP_GD_JPEG],[
   if test "$PHP_JPEG_DIR" != "no"; then
 
     for i in $PHP_JPEG_DIR /usr/local /usr; do
@@ -72,7 +72,7 @@ AC_DEFUN(PHP_GD_JPEG,[
   fi
 ])
 
-AC_DEFUN(PHP_GD_PNG,[
+AC_DEFUN([PHP_GD_PNG],[
   if test "$PHP_PNG_DIR" != "no"; then
 
     for i in $PHP_PNG_DIR /usr/local /usr; do
@@ -107,7 +107,7 @@ AC_DEFUN(PHP_GD_PNG,[
   fi
 ])
 
-AC_DEFUN(PHP_GD_XPM,[
+AC_DEFUN([PHP_GD_XPM],[
   if test "$PHP_XPM_DIR" != "no"; then
 
     for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do
@@ -141,7 +141,7 @@ AC_DEFUN(PHP_GD_XPM,[
   fi
 ])
 
-AC_DEFUN(PHP_GD_FREETYPE1,[
+AC_DEFUN([PHP_GD_FREETYPE1],[
   if test "$PHP_TTF" != "no"; then
     if test "$PHP_FREETYPE_DIR" = "no" -o "$PHP_FREETYPE_DIR" = ""; then
       if test -n "$PHP_TTF"; then
@@ -175,7 +175,7 @@ AC_DEFUN(PHP_GD_FREETYPE1,[
   fi
 ])
 
-AC_DEFUN(PHP_GD_FREETYPE2,[
+AC_DEFUN([PHP_GD_FREETYPE2],[
   if test "$PHP_FREETYPE_DIR" != "no"; then
 
     for i in $PHP_FREETYPE_DIR /usr/local /usr; do
@@ -200,7 +200,7 @@ AC_DEFUN(PHP_GD_FREETYPE2,[
   fi
 ])
 
-AC_DEFUN(PHP_GD_T1LIB,[
+AC_DEFUN([PHP_GD_T1LIB],[
   if test "$PHP_T1LIB" != "no"; then
 
     for i in $PHP_T1LIB /usr/local /usr; do
@@ -224,19 +224,19 @@ AC_DEFUN(PHP_GD_T1LIB,[
   fi
 ])
 
-AC_DEFUN(PHP_GD_TTSTR,[
+AC_DEFUN([PHP_GD_TTSTR],[
   if test "$PHP_GD_NATIVE_TTF" = "yes"; then
     AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
   fi
 ])
 
-AC_DEFUN(PHP_GD_JISX0208,[
+AC_DEFUN([PHP_GD_JISX0208],[
   if test "$PHP_GD_JIS_CONV" = "yes"; then
     USE_GD_JIS_CONV=1
   fi
 ])
 
-AC_DEFUN(PHP_GD_CHECK_VERSION,[
+AC_DEFUN([PHP_GD_CHECK_VERSION],[
   PHP_CHECK_LIBRARY(gd, gdImageString16,        [AC_DEFINE(HAVE_LIBGD13,             1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
   PHP_CHECK_LIBRARY(gd, gdImagePaletteCopy,     [AC_DEFINE(HAVE_LIBGD15,             1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
   PHP_CHECK_LIBRARY(gd, gdImageCreateFromPng,   [AC_DEFINE(HAVE_GD_PNG,              1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])

diff --git a/ext/imap/config.m4 b/ext/imap/config.m4
index e0706aaadbc56e80dc0995cca28a94fa5f135d7b..d2384862414976d92c80b32312d05a6ca4fac7dd 100644 (file)
--- a/ext/imap/config.m4
+++ b/ext/imap/config.m4
@@ -2,7 +2,7 @@ dnl
 dnl $Id$
 dnl
 
-AC_DEFUN(IMAP_INC_CHK,[if test -r "$i$1/c-client.h"; then
+AC_DEFUN([IMAP_INC_CHK],[if test -r "$i$1/c-client.h"; then
     AC_DEFINE(HAVE_IMAP2000, 1, [ ])
     IMAP_DIR=$i
     IMAP_INC_DIR=$i$1
@@ -13,7 +13,7 @@ AC_DEFUN(IMAP_INC_CHK,[if test -r "$i$1/c-client.h"; then
        break
 ])
 
-AC_DEFUN(IMAP_LIB_CHK,[
+AC_DEFUN([IMAP_LIB_CHK],[
   str="$IMAP_DIR/$1/lib$lib.*"
   for i in `echo $str`; do
     test -r $i && IMAP_LIBDIR=$IMAP_DIR/$1 && break 2
@@ -21,7 +21,7 @@ AC_DEFUN(IMAP_LIB_CHK,[
 ])
 
 dnl PHP_IMAP_TEST_BUILD(function, action-if-ok, action-if-not-ok [, extra-libs])
-AC_DEFUN(PHP_IMAP_TEST_BUILD, [
+AC_DEFUN([PHP_IMAP_TEST_BUILD], [
   old_LIBS=$LIBS
   LIBS="$4 $LIBS"
   AC_TRY_RUN([
@@ -54,7 +54,7 @@ AC_DEFUN(PHP_IMAP_TEST_BUILD, [
   ])
 ])
 
-AC_DEFUN(PHP_IMAP_KRB_CHK, [
+AC_DEFUN([PHP_IMAP_KRB_CHK], [
   AC_ARG_WITH(kerberos,
   [  --with-kerberos[=DIR]     IMAP: Include Kerberos support. DIR is the Kerberos install dir.],[
     PHP_KERBEROS=$withval
@@ -101,7 +101,7 @@ AC_DEFUN(PHP_IMAP_KRB_CHK, [
 
 ])
 
-AC_DEFUN(PHP_IMAP_SSL_CHK, [
+AC_DEFUN([PHP_IMAP_SSL_CHK], [
   AC_ARG_WITH(imap-ssl,
   [  --with-imap-ssl=<DIR>     IMAP: Include SSL support. DIR is the OpenSSL install dir.],[
     PHP_IMAP_SSL=$withval

diff --git a/ext/java/config.m4 b/ext/java/config.m4
index 5ee63d71ff3c4438aba9350ce4393bf802852ba8..194eda7362e6b424bc1cc4afda497a654e07ef7c 100644 (file)
--- a/ext/java/config.m4
+++ b/ext/java/config.m4
@@ -1,7 +1,7 @@
 dnl
 dnl $Id$
 dnl
-AC_DEFUN(JAVA_FIND_JAR, [
+AC_DEFUN([JAVA_FIND_JAR], [
  AC_MSG_CHECKING([Java Jar location])
   if test "$PHP_JAVA" = "yes"; then
     if JAVA_JAR=`which jar 2>/dev/null`; then
@@ -31,7 +31,7 @@ AC_DEFUN(JAVA_FIND_JAR, [
   AC_MSG_RESULT([$JAVA_JAR])
 ])
 
-AC_DEFUN(JAVA_FIND_C, [
+AC_DEFUN([JAVA_FIND_C], [
  AC_MSG_CHECKING([Java C location])
  if test "$PHP_JAVA" = "yes"; then
    JAVA_C=`which javac`
@@ -55,7 +55,7 @@ e.g. --with-java=/java expecting /java/bin/ to contain the binaries])
   AC_MSG_RESULT([$JAVA_C])
 ])
 
-AC_DEFUN(JAVA_CHECK_LIB, [
+AC_DEFUN([JAVA_CHECK_LIB], [
  AC_MSG_CHECKING([Checking for libjava])
  if test -d $PHP_JAVA/lib/kaffe; then
    PHP_ADD_LIBPATH($PHP_JAVA/lib)

diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4
index e1425fd744bb92ee1a14a0d675f0affb4dc44483..7555f43ccb25214528cfea382bad5a7229afb189 100644 (file)
--- a/ext/ldap/config.m4
+++ b/ext/ldap/config.m4
@@ -2,7 +2,7 @@ dnl
 dnl $Id$
 dnl
 
-AC_DEFUN(PHP_LDAP_CHECKS, [
+AC_DEFUN([PHP_LDAP_CHECKS], [
   if test -f $1/include/ldap.h; then
     LDAP_DIR=$1
     LDAP_INCDIR=$1/include

diff --git a/ext/msql/config.m4 b/ext/msql/config.m4
index 093dfa54e98067ed8cd0160cddc11294e6d59735..f9a13d37583e2ba1012de3f21efc2e8895d16e24 100644 (file)
--- a/ext/msql/config.m4
+++ b/ext/msql/config.m4
@@ -5,7 +5,7 @@ dnl
 dnl
 dnl Test mSQL version by checking if msql.h has "IDX_TYPE" defined.
 dnl
-AC_DEFUN(PHP_MSQL_VERSION,[
+AC_DEFUN([PHP_MSQL_VERSION],[
   AC_MSG_CHECKING([mSQL version])
   ac_php_oldcppflags=$CPPFLAGS
   CPPFLAGS="$INCLUDES $CPPFLAGS"

diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4
index 0bd79cc7a3b9877a0161c14cce16e9741a95d8ae..cf8a82b971968f1247bcef8195419a407f4d76df 100644 (file)
--- a/ext/mysql/config.m4
+++ b/ext/mysql/config.m4
@@ -7,7 +7,7 @@ sinclude(ext/mysql/libmysql/mysql.m4)
 sinclude(libmysql/acinclude.m4)
 sinclude(libmysql/mysql.m4)
 
-AC_DEFUN(MYSQL_LIB_CHK, [
+AC_DEFUN([MYSQL_LIB_CHK], [
   str="$MYSQL_DIR/$1/libmysqlclient.*"
   for j in `echo $str`; do
     if test -r $j; then
@@ -17,7 +17,7 @@ AC_DEFUN(MYSQL_LIB_CHK, [
   done
 ])
 
-AC_DEFUN(PHP_MYSQL_SOCKET_SEARCH, [
+AC_DEFUN([PHP_MYSQL_SOCKET_SEARCH], [
   for i in  \
     /var/run/mysqld/mysqld.sock \
     /var/tmp/mysql.sock \

diff --git a/ext/mysql/libmysql/acinclude.m4 b/ext/mysql/libmysql/acinclude.m4
index 1f2b42649d84de1c217769b68272a6fc3945ca45..df3ccad93fee2f7c5c2f6962990146479fc39e04 100644 (file)
--- a/ext/mysql/libmysql/acinclude.m4
+++ b/ext/mysql/libmysql/acinclude.m4
@@ -1,6 +1,6 @@
 # Local macros for automake & autoconf
 
-AC_DEFUN(MYSQL_FUNCTION_CHECKS,[
+AC_DEFUN([MYSQL_FUNCTION_CHECKS],[
 
 # Standard MySQL list
 AC_CHECK_FUNCS(alarm bmove \
@@ -27,7 +27,7 @@ AC_CHECK_FUNCS(strtok_r)
 MYSQL_CHECK_GETHOSTNAME_R
 ])
 
-AC_DEFUN(MYSQL_CHECK_GETHOSTNAME_R,[
+AC_DEFUN([MYSQL_CHECK_GETHOSTNAME_R],[
 # Check definition of gethostbyname_r (glibc2.0.100 is different from Solaris)
 ac_save_CXXFLAGS="$CXXFLAGS"
 AC_CACHE_CHECK([style of gethostname_r routines], mysql_cv_gethostname_style,
@@ -90,7 +90,7 @@ then
 fi
 ])
 
-AC_DEFUN(MYSQL_CHECK_SIGWAIT_STYLE,[
+AC_DEFUN([MYSQL_CHECK_SIGWAIT_STYLE],[
 # Check definition av posix sigwait()
 AC_CACHE_CHECK("style of sigwait", mysql_cv_sigwait,
 AC_TRY_LINK(
@@ -134,7 +134,7 @@ fi
 fi
 ])
 
-AC_DEFUN(MYSQL_CHECK_READDIR_R_ARGS,[
+AC_DEFUN([MYSQL_CHECK_READDIR_R_ARGS],[
 # Check definition of readdir_r
 AC_CACHE_CHECK("args to readdir_r", mysql_cv_readdir_r,
 AC_TRY_LINK(
@@ -153,7 +153,7 @@ then
 fi
 ])
 
-AC_DEFUN(MYSQL_CHECK_PTHREAD_MUTEX_INIT,[
+AC_DEFUN([MYSQL_CHECK_PTHREAD_MUTEX_INIT],[
   # Check definition of pthread_mutex_init
   AC_CACHE_CHECK("args to pthread_mutex_init", mysql_cv_mutex_init_args,
   AC_TRY_COMPILE(
@@ -173,7 +173,7 @@ mysql_cv_mutex_init_args=POSIX, mysql_cv_mutex_init_args=other))
   fi
 ])
 
-AC_DEFUN(MYSQL_CHECK_PTHREAD_GETSPECIFIC,[
+AC_DEFUN([MYSQL_CHECK_PTHREAD_GETSPECIFIC],[
   # Check definition of pthread_getspecific
   AC_CACHE_CHECK("args to pthread_getspecific", mysql_cv_getspecific_args,
   AC_TRY_COMPILE(
@@ -191,7 +191,7 @@ mysql_cv_getspecific_args=POSIX, mysql_cv_getspecific_args=other))
   fi
 ])
 
-AC_DEFUN(MYSQL_TYPE_ACCEPT,
+AC_DEFUN([MYSQL_TYPE_ACCEPT],
 [ac_save_CXXFLAGS="$CXXFLAGS"
 AC_CACHE_CHECK([base type of last arg to accept], mysql_cv_btype_last_arg_accept,
 AC_LANG_SAVE
@@ -224,7 +224,7 @@ CXXFLAGS="$ac_save_CXXFLAGS"
 ])
 
 dnl Find type of qsort
-AC_DEFUN(MYSQL_TYPE_QSORT,
+AC_DEFUN([MYSQL_TYPE_QSORT],
 [AC_CACHE_CHECK([return type of qsort], mysql_cv_type_qsort,
 [AC_TRY_COMPILE([#include <stdlib.h>
 #ifdef __cplusplus
@@ -243,7 +243,7 @@ fi
 
 
 #---START: Used in for client configure
-AC_DEFUN(MYSQL_CHECK_ULONG,
+AC_DEFUN([MYSQL_CHECK_ULONG],
 [AC_MSG_CHECKING(for type ulong)
 AC_CACHE_VAL(ac_cv_ulong,
 [AC_TRY_RUN([#include <stdio.h>
@@ -261,7 +261,7 @@ then
 fi
 ])
 
-AC_DEFUN(MYSQL_CHECK_UCHAR,
+AC_DEFUN([MYSQL_CHECK_UCHAR],
 [AC_MSG_CHECKING(for type uchar)
 AC_CACHE_VAL(ac_cv_uchar,
 [AC_TRY_RUN([#include <stdio.h>
@@ -279,7 +279,7 @@ then
 fi
 ])
 
-AC_DEFUN(MYSQL_CHECK_UINT,
+AC_DEFUN([MYSQL_CHECK_UINT],
 [AC_MSG_CHECKING(for type uint)
 AC_CACHE_VAL(ac_cv_uint,
 [AC_TRY_RUN([#include <stdio.h>
@@ -297,7 +297,7 @@ then
 fi
 ])
 
-AC_DEFUN(MYSQL_CHECK_USHORT,
+AC_DEFUN([MYSQL_CHECK_USHORT],
 [AC_MSG_CHECKING(for type ushort)
 AC_CACHE_VAL(ac_cv_ushort,
 [AC_TRY_RUN([#include <stdio.h>
@@ -315,7 +315,7 @@ then
 fi
 ])
 
-AC_DEFUN(MYSQL_CHECK_INT_8_16_32,
+AC_DEFUN([MYSQL_CHECK_INT_8_16_32],
 [AC_MSG_CHECKING([for int8])
 AC_CACHE_VAL(ac_cv_int8,
 [AC_TRY_RUN([
@@ -345,7 +345,7 @@ fi
 ])
 
 
-AC_DEFUN(MYSQL_HEADER_CHECKS,[
+AC_DEFUN([MYSQL_HEADER_CHECKS],[
 AC_HEADER_STDC
 AC_CHECK_HEADERS(sgtty.h sys/ioctl.h \
  fcntl.h float.h floatingpoint.h ieeefp.h limits.h \
@@ -356,7 +356,7 @@ AC_CHECK_HEADERS(sgtty.h sys/ioctl.h \
  unistd.h utime.h sys/utime.h termio.h termios.h sched.h crypt.h alloca.h)
 ])
 
-AC_DEFUN(MYSQL_TYPE_CHECKS,[
+AC_DEFUN([MYSQL_TYPE_CHECKS],[
 
 AC_REQUIRE([AC_C_CONST])
 AC_REQUIRE([AC_C_INLINE])

diff --git a/ext/mysql/libmysql/mysql.m4 b/ext/mysql/libmysql/mysql.m4
index 23143e36a867c5a2e7cca7db51324e5cd7bd6c7c..27c8b96af717ae916775be92d840b2286eb1066d 100644 (file)
--- a/ext/mysql/libmysql/mysql.m4
+++ b/ext/mysql/libmysql/mysql.m4
@@ -1,4 +1,4 @@
-AC_DEFUN(MYSQL_CHECKS,[        
+AC_DEFUN([MYSQL_CHECKS],[      
 
 AC_REQUIRE([AC_PROG_CC])
 AC_REQUIRE([AC_PROG_LN_S])

diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
index 44a15fc17a40c1bbb12c34fe36f9a5209d0054c6..c1af08c1838f8065989dad311d5c6886c92e18f7 100644 (file)
--- a/ext/oci8/config.m4
+++ b/ext/oci8/config.m4
@@ -2,7 +2,7 @@ dnl
 dnl $Id$
 dnl
 
-AC_DEFUN(PHP_OCI_IF_DEFINED,[
+AC_DEFUN([PHP_OCI_IF_DEFINED],[
   old_CPPFLAGS=$CPPFLAGS
   CPPFLAGS=$3
   AC_EGREP_CPP(yes,[
@@ -18,7 +18,7 @@ AC_DEFUN(PHP_OCI_IF_DEFINED,[
   ])
 ])
 
-AC_DEFUN(AC_OCI8_VERSION,[
+AC_DEFUN([AC_OCI8_VERSION],[
   AC_MSG_CHECKING([Oracle version])
   if test -s "$OCI8_DIR/orainst/unix.rgs"; then
     OCI8_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4`
@@ -43,7 +43,7 @@ AC_DEFUN(AC_OCI8_VERSION,[
   AC_MSG_RESULT($OCI8_VERSION)
 ])                                                                                                                                                                
 
-AC_DEFUN(AC_OCI8IC_VERSION,[
+AC_DEFUN([AC_OCI8IC_VERSION],[
   AC_MSG_CHECKING([Oracle Instant Client version])
   if test -f $PHP_OCI8_INSTANT_CLIENT/libociei.$SHLIB_SUFFIX_NAME; then
     if test -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then

diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index 8c7eb01ba2e5d5456f3e00d8f0959adac6bb8b03..d41c27d4791ee8b03f817eb7d813887cc88fc912 100644 (file)
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -5,7 +5,7 @@ dnl
 dnl
 dnl Figure out which library file to link with for the Solid support.
 dnl
-AC_DEFUN(AC_FIND_SOLID_LIBS,[
+AC_DEFUN([AC_FIND_SOLID_LIBS],[
   AC_MSG_CHECKING([Solid library file])  
   ac_solid_uname_r=`uname -r 2>/dev/null`
   ac_solid_uname_s=`uname -s 2>/dev/null`
@@ -71,7 +71,7 @@ fi
 dnl
 dnl Figure out which library file to link with for the Empress support.
 dnl
-AC_DEFUN(AC_FIND_EMPRESS_LIBS,[
+AC_DEFUN([AC_FIND_EMPRESS_LIBS],[
   AC_MSG_CHECKING([Empress library file])
   ODBC_LIBS=`echo $1/libempodbccl.so | cut -d' ' -f1`
   if test ! -f $ODBC_LIBS; then
@@ -80,7 +80,7 @@ AC_DEFUN(AC_FIND_EMPRESS_LIBS,[
   AC_MSG_RESULT(`echo $ODBC_LIBS | sed -e 's!.*/!!'`)
 ])
 
-AC_DEFUN(AC_FIND_EMPRESS_BCS_LIBS,[
+AC_DEFUN([AC_FIND_EMPRESS_BCS_LIBS],[
   AC_MSG_CHECKING([Empress local access library file])
   ODBCBCS_LIBS=`echo $1/libempodbcbcs.a | cut -d' ' -f1`
   if test ! -f $ODBCBCS_LIBS; then

diff --git a/ext/oracle/config.m4 b/ext/oracle/config.m4
index fdd5276ccde123ca596dfa2b2d8a278ab2ae6195..96895b44084f6c860eaaa3dbf562062b096a2b55 100644 (file)
--- a/ext/oracle/config.m4
+++ b/ext/oracle/config.m4
@@ -2,7 +2,7 @@ dnl
 dnl $Id$
 dnl
 
-AC_DEFUN(AC_ORACLE_VERSION,[
+AC_DEFUN([AC_ORACLE_VERSION],[
   AC_MSG_CHECKING([Oracle version])
   if test -s "$ORACLE_DIR/orainst/unix.rgs"; then
        ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4`

diff --git a/ext/pgsql/config.m4 b/ext/pgsql/config.m4
index efccb17e94e7aec44482041effe851cadd7ad725..4967f22f472dcb1b2ec0459a030d42486aadfa79 100644 (file)
--- a/ext/pgsql/config.m4
+++ b/ext/pgsql/config.m4
@@ -2,9 +2,6 @@ dnl
 dnl $Id$
 dnl
 
-AC_DEFUN(PHP_PGSQL_CHECK_FUNCTIONS,[
-])
-
 PHP_ARG_WITH(pgsql,for PostgreSQL support,
 [  --with-pgsql[=DIR]      Include PostgreSQL support.  DIR is the PostgreSQL
                           base install directory, defaults to /usr/local/pgsql.])

diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
index 62d84d0ab8eb20a51b908cb78f96e9f8c33ec239..afc8201f2398c2ee1af1a0bdeaaa39161e9ec5e6 100644 (file)
--- a/ext/standard/config.m4
+++ b/ext/standard/config.m4
@@ -5,7 +5,7 @@ divert(3)dnl
 dnl
 dnl Check if flush should be called explicitly after buffered io
 dnl
-AC_DEFUN(AC_FLUSH_IO,[
+AC_DEFUN([AC_FLUSH_IO],[
   AC_CACHE_CHECK([whether flush should be called explicitly after a buffered io], ac_cv_flush_io,[
   AC_TRY_RUN( [
 #include <stdio.h>
@@ -56,7 +56,7 @@ int main(int argc, char **argv)
 dnl
 dnl Check for crypt() capabilities
 dnl
-AC_DEFUN(AC_CRYPT_CAP,[
+AC_DEFUN([AC_CRYPT_CAP],[
 
   if test "$ac_cv_func_crypt" = "no"; then
   AC_CHECK_LIB(crypt, crypt, [
@@ -65,7 +65,7 @@ AC_DEFUN(AC_CRYPT_CAP,[
   ])
   fi
   
-  AC_CACHE_CHECK(for standard DES crypt, ac_cv_crypt_des,[
+  AC_CACHE_CHECK([for standard DES crypt], ac_cv_crypt_des,[
   AC_TRY_RUN([
 #if HAVE_UNISTD_H
 #include <unistd.h>

diff --git a/ext/xmlrpc/libxmlrpc/acinclude.m4 b/ext/xmlrpc/libxmlrpc/acinclude.m4
index 07bf4f0b0776682ca1ac2d60c264680c9b1092fe..49b6090f6b0684b2ec156db23c0a6f8800941650 100644 (file)
--- a/ext/xmlrpc/libxmlrpc/acinclude.m4
+++ b/ext/xmlrpc/libxmlrpc/acinclude.m4
@@ -1,6 +1,6 @@
 # Local macros for automake & autoconf
 
-AC_DEFUN(XMLRPC_FUNCTION_CHECKS,[
+AC_DEFUN([XMLRPC_FUNCTION_CHECKS],[
 
 # Standard XMLRPC list
 AC_CHECK_FUNCS( \
@@ -10,12 +10,12 @@ AC_CHECK_FUNCS( \
 
 ])
 
-AC_DEFUN(XMLRPC_HEADER_CHECKS,[
+AC_DEFUN([XMLRPC_HEADER_CHECKS],[
 AC_HEADER_STDC
 AC_CHECK_HEADERS(xmlparse.h xmltok.h stdlib.h strings.h string.h)
 ])
 
-AC_DEFUN(XMLRPC_TYPE_CHECKS,[
+AC_DEFUN([XMLRPC_TYPE_CHECKS],[
 
 AC_REQUIRE([AC_C_CONST])
 AC_REQUIRE([AC_C_INLINE])

diff --git a/ext/xmlrpc/libxmlrpc/xmlrpc.m4 b/ext/xmlrpc/libxmlrpc/xmlrpc.m4
index e89c245f0253b7f15fb7da24ca6ed0c83d74e2f1..87da92db8a678563a9d285c77ef22d055f3ad87c 100644 (file)
--- a/ext/xmlrpc/libxmlrpc/xmlrpc.m4
+++ b/ext/xmlrpc/libxmlrpc/xmlrpc.m4
@@ -1,4 +1,4 @@
-AC_DEFUN(XMLRPC_CHECKS,[       
+AC_DEFUN([XMLRPC_CHECKS],[     
 
 AC_REQUIRE([AC_PROG_CC])
 AC_REQUIRE([AC_PROG_LN_S])

diff --git a/sapi/cgi/config9.m4 b/sapi/cgi/config9.m4
index 1d786bfbaa08d6bd4ccd6dd5266e2b69bf4a80f6..8c06ed85011d47b18304f92acc21f7001b9bc169 100644 (file)
--- a/sapi/cgi/config9.m4
+++ b/sapi/cgi/config9.m4
@@ -51,7 +51,7 @@ AC_ARG_ENABLE(path-info-check,
   PHP_ENABLE_PATHINFO_CHECK=yes
 ])
 
-AC_DEFUN(PHP_TEST_WRITE_STDOUT,[
+AC_DEFUN([PHP_TEST_WRITE_STDOUT],[
   AC_CACHE_CHECK(whether writing to stdout works,ac_cv_write_stdout,[
     AC_TRY_RUN([
 #ifdef HAVE_UNISTD_H

diff --git a/sapi/cgi/libfcgi/acinclude.m4 b/sapi/cgi/libfcgi/acinclude.m4
index 20f02d8339e22a3e9b910280154cdada44cfc600..cd610142e9096a63bf722aa23f05c5c5c8742945 100644 (file)
--- a/sapi/cgi/libfcgi/acinclude.m4
+++ b/sapi/cgi/libfcgi/acinclude.m4
@@ -1,6 +1,6 @@
 dnl     $Id$
 
-AC_DEFUN(FCGI_COMMON_CHECKS, [
+AC_DEFUN([FCGI_COMMON_CHECKS], [
     AC_MSG_CHECKING([for sun_len in sys/un.h])
     AC_EGREP_HEADER([sun_len], [sys/un.h],
        [AC_MSG_RESULT([yes])

diff --git a/scripts/phpize.m4 b/scripts/phpize.m4
index 8ed89ddf86ba8b8f56a2f8910543ee60f24e13aa..123acaef7f86c94b7993acce2a49f24c33913b9f 100644 (file)
--- a/scripts/phpize.m4
+++ b/scripts/phpize.m4
@@ -6,7 +6,7 @@ AC_CANONICAL_HOST
 
 PHP_INIT_BUILD_SYSTEM
 
-AC_DEFUN(PHP_WITH_PHP_CONFIG,[
+AC_DEFUN([PHP_WITH_PHP_CONFIG],[
   AC_ARG_WITH(php-config,
 [  --with-php-config=PATH],[
   PHP_CONFIG=$withval
@@ -29,10 +29,10 @@ AC_DEFUN(PHP_WITH_PHP_CONFIG,[
   AC_MSG_RESULT($EXTENSION_DIR)
 ])
 dnl
-AC_DEFUN(PHP_EXT_BUILDDIR,[.])dnl
-AC_DEFUN(PHP_EXT_DIR,[""])dnl
-AC_DEFUN(PHP_EXT_SRCDIR,[$abs_srcdir])dnl
-AC_DEFUN(PHP_ALWAYS_SHARED,[
+AC_DEFUN([PHP_EXT_BUILDDIR],[.])dnl
+AC_DEFUN([PHP_EXT_DIR],[""])dnl
+AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir])dnl
+AC_DEFUN([PHP_ALWAYS_SHARED],[
   ext_output="yes, shared"
   ext_shared=yes
   test "[$]$1" = "no" && $1=yes