summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TSRM/acinclude.m42
-rw-r--r--TSRM/threads.m48
-rw-r--r--TSRM/tsrm.m412
-rw-r--r--Zend/Zend.m414
-rw-r--r--Zend/acinclude.m46
-rw-r--r--acinclude.m48
-rw-r--r--configure.in8
-rw-r--r--ext/bcmath/libbcmath/aclocal.m48
-rw-r--r--ext/cpdf/config.m44
-rw-r--r--ext/dba/config.m420
-rw-r--r--ext/gd/config.m418
-rw-r--r--ext/imap/config.m410
-rw-r--r--ext/ldap/config.m44
-rw-r--r--ext/mcrypt/config.m42
-rw-r--r--ext/msql/config.m42
-rw-r--r--ext/mysql/config.m44
-rw-r--r--ext/oci8/config.m48
-rw-r--r--ext/odbc/config.m46
-rw-r--r--ext/oracle/config.m42
-rw-r--r--ext/pgsql/config.m42
-rw-r--r--ext/standard/config.m44
-rw-r--r--ext/xmlrpc/libxmlrpc/acinclude.m46
-rw-r--r--ext/xmlrpc/libxmlrpc/xmlrpc.m42
-rw-r--r--sapi/cgi/config9.m42
-rw-r--r--sapi/cgi/libfcgi/acinclude.m42
-rw-r--r--scripts/phpize.m410
26 files changed, 87 insertions, 87 deletions
diff --git a/TSRM/acinclude.m4 b/TSRM/acinclude.m4
index 1953172aef..fcf97fd352 100644
--- 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 790579656e..e2ae7a1033 100644
--- 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 291b7f2e4e..a06c2a694d 100644
--- 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/Zend/Zend.m4 b/Zend/Zend.m4
index 129bcaa395..eb24b3aca9 100644
--- a/Zend/Zend.m4
+++ b/Zend/Zend.m4
@@ -4,7 +4,7 @@ dnl
dnl This file contains Zend specific autoconf functions.
dnl
-AC_DEFUN(LIBZEND_BISON_CHECK,[
+AC_DEFUN([LIBZEND_BISON_CHECK],[
if test "$YACC" != "bison -y"; then
AC_MSG_WARN(You will need bison if you want to regenerate the Zend parser.)
@@ -19,7 +19,7 @@ fi
])
-AC_DEFUN(LIBZEND_BASIC_CHECKS,[
+AC_DEFUN([LIBZEND_BASIC_CHECKS],[
AC_REQUIRE([AC_PROG_YACC])
AC_REQUIRE([AC_PROG_CC])
@@ -58,12 +58,12 @@ dlfcn.h)
AC_TYPE_SIZE_T
AC_TYPE_SIGNAL
-AC_DEFUN(LIBZEND_LIBDL_CHECKS,[
+AC_DEFUN([LIBZEND_LIBDL_CHECKS],[
AC_CHECK_LIB(dl, dlopen, [LIBS="-ldl $LIBS"])
AC_CHECK_FUNC(dlopen,[AC_DEFINE(HAVE_LIBDL, 1,[ ])])
])
-AC_DEFUN(LIBZEND_DLSYM_CHECK,[
+AC_DEFUN([LIBZEND_DLSYM_CHECK],[
dnl
dnl Ugly hack to check if dlsym() requires a leading underscore in symbol name.
dnl
@@ -95,7 +95,7 @@ ZEND_FP_EXCEPT
])
-AC_DEFUN(LIBZEND_ENABLE_DEBUG,[
+AC_DEFUN([LIBZEND_ENABLE_DEBUG],[
AC_ARG_ENABLE(debug,
[ --enable-debug Compile with debugging symbols],[
@@ -106,7 +106,7 @@ AC_ARG_ENABLE(debug,
])
-AC_DEFUN(LIBZEND_OTHER_CHECKS,[
+AC_DEFUN([LIBZEND_OTHER_CHECKS],[
PHP_ARG_WITH(zend-vm,[virtual machine dispatch method],
[ --with-zend-vm=TYPE Sets virtual machine dispatch methos. Type is
@@ -267,7 +267,7 @@ AC_MSG_RESULT(done)
])
-AC_DEFUN(LIBZEND_CPLUSPLUS_CHECKS,[
+AC_DEFUN([LIBZEND_CPLUSPLUS_CHECKS],[
])
diff --git a/Zend/acinclude.m4 b/Zend/acinclude.m4
index 395f7220db..c5d9503a6d 100644
--- a/Zend/acinclude.m4
+++ b/Zend/acinclude.m4
@@ -2,7 +2,7 @@ dnl $Id$
dnl
dnl This file contains local autoconf functions.
-AC_DEFUN(ZEND_FP_EXCEPT,[
+AC_DEFUN([ZEND_FP_EXCEPT],[
AC_CACHE_CHECK(whether fp_except is defined, ac_cv_type_fp_except,[
AC_TRY_COMPILE([
#include <floatingpoint.h>
@@ -23,7 +23,7 @@ fp_except x = (fp_except) 0;
dnl
dnl Check for broken sprintf()
dnl
-AC_DEFUN(AC_ZEND_BROKEN_SPRINTF,[
+AC_DEFUN([AC_ZEND_BROKEN_SPRINTF],[
AC_CACHE_CHECK(whether sprintf is broken, ac_cv_broken_sprintf,[
AC_TRY_RUN([main() {char buf[20];exit(sprintf(buf,"testing 123")!=11); }],[
ac_cv_broken_sprintf=no
@@ -41,7 +41,7 @@ AC_DEFUN(AC_ZEND_BROKEN_SPRINTF,[
AC_DEFINE_UNQUOTED(ZEND_BROKEN_SPRINTF, $ac_result, [Whether sprintf is broken])
])
-AC_DEFUN(AM_SET_LIBTOOL_VARIABLE,[
+AC_DEFUN([AM_SET_LIBTOOL_VARIABLE],[
LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
])
diff --git a/acinclude.m4 b/acinclude.m4
index 9e6aecb6cc..fe3887fa34 100644
--- 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;])
])
@@ -1909,7 +1909,7 @@ dnl
dnl PHP_TEST_BUILD(function, action-if-ok, action-if-not-ok [, extra-libs [, extra-source]])
dnl This macro checks whether build works and given function exists.
dnl
-AC_DEFUN(PHP_TEST_BUILD, [
+AC_DEFUN([PHP_TEST_BUILD], [
old_LIBS=$LIBS
LIBS="$4 $LIBS"
AC_TRY_RUN([
@@ -1937,14 +1937,14 @@ dnl $1 = name of extension, $2 = extension upon which it depends
dnl $3 = optional: if true, it's ok for $2 to have not been configured
dnl default is false and should halt the build.
dnl See ADD_EXTENSION_DEP in win32 build
-AC_DEFUN(PHP_ADD_EXTENSION_DEP, [])
+AC_DEFUN([PHP_ADD_EXTENSION_DEP], [])
dnl PHP_CHECK_64BIT([do if 32], [do if 64])
dnl This macro is used to detect if we're at 64-bit platform or not.
dnl It could be useful for those external libs, that have different precompiled
dnl versions in different directories.
-AC_DEFUN(PHP_CHECK_64BIT,[
+AC_DEFUN([PHP_CHECK_64BIT],[
AC_CHECK_SIZEOF(int)
AC_MSG_CHECKING([checking if we're at 64-bit platform])
if test "$ac_cv_sizeof_int" = "4" ; then
diff --git a/configure.in b/configure.in
index 7a0011a44c..5ee53e6192 100644
--- a/configure.in
+++ b/configure.in
@@ -47,10 +47,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 f23ba2904e..e60c9eb55c 100644
--- 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 b432f6b147..2ee5e601d5 100644
--- 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/dba/config.m4 b/ext/dba/config.m4
index 72a7611908..7f3c359a8a 100644
--- 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/$PHP_LIBDIR
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"
@@ -169,7 +169,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/$PHP_LIBDIR/lib$LIB.a -o -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then
PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/$PHP_LIBDIR, -l$LIB,[
@@ -381,7 +381,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, [ ])
@@ -427,7 +427,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"
@@ -445,7 +445,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/gd/config.m4 b/ext/gd/config.m4
index 5eeb481f42..2fad1e8046 100644
--- 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
@@ -176,7 +176,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
@@ -201,7 +201,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
@@ -225,19 +225,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 bfb1444b60..b892130d18 100644
--- 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], [
PHP_TEST_BUILD([$1], [$2], [$3], [$4],
[
void mm_log(void){}
@@ -42,7 +42,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
@@ -89,7 +89,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/ldap/config.m4 b/ext/ldap/config.m4
index b762efbe36..ed7f506c5b 100644
--- 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
@@ -18,7 +18,7 @@ AC_DEFUN(PHP_LDAP_CHECKS, [
fi
])
-AC_DEFUN(PHP_LDAP_SASL_CHECKS, [
+AC_DEFUN([PHP_LDAP_SASL_CHECKS], [
if test "$1" = "yes"; then
SEARCH_DIRS="/usr/local /usr"
else
diff --git a/ext/mcrypt/config.m4 b/ext/mcrypt/config.m4
index 4d9cc3eb06..0e162c5997 100644
--- a/ext/mcrypt/config.m4
+++ b/ext/mcrypt/config.m4
@@ -2,7 +2,7 @@ dnl
dnl $Id$
dnl
-AC_DEFUN(PHP_MCRYPT_CHECK_VERSION,[
+AC_DEFUN([PHP_MCRYPT_CHECK_VERSION],[
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS=-I$MCRYPT_DIR/include
AC_MSG_CHECKING(for libmcrypt version)
diff --git a/ext/msql/config.m4 b/ext/msql/config.m4
index 093dfa54e9..f9a13d3758 100644
--- 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 c45c8d4776..aec07a6784 100644
--- a/ext/mysql/config.m4
+++ b/ext/mysql/config.m4
@@ -2,7 +2,7 @@ dnl
dnl $Id$
dnl
-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
@@ -12,7 +12,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/oci8/config.m4 b/ext/oci8/config.m4
index cb465a837e..fe37fe71f2 100644
--- 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_CHECK_LIB_DIR,[
+AC_DEFUN([AC_OCI8_CHECK_LIB_DIR],[
PHP_CHECK_64BIT([ TMP_OCI8_LIB_DIR=lib32 ], [ TMP_OCI8_LIB_DIR=lib ])
AC_MSG_CHECKING([OCI8 libraries dir])
if test -d "$OCI8_DIR/lib" -a ! -d "$OCI8_DIR/lib32"; then
@@ -33,7 +33,7 @@ AC_DEFUN(AC_OCI8_CHECK_LIB_DIR,[
AC_MSG_RESULT($OCI8_LIB_DIR)
])
-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
@@ -51,7 +51,7 @@ AC_DEFUN(AC_OCI8IC_VERSION,[
])
-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`
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index 228228ac5a..b97fc6d856 100644
--- 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 fdd5276ccd..96895b4408 100644
--- 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 dbe7b41230..334ea86248 100644
--- a/ext/pgsql/config.m4
+++ b/ext/pgsql/config.m4
@@ -2,7 +2,7 @@ dnl
dnl $Id$
dnl
-AC_DEFUN(PHP_PGSQL_CHECK_FUNCTIONS,[
+AC_DEFUN([PHP_PGSQL_CHECK_FUNCTIONS],[
])
PHP_ARG_WITH(pgsql,for PostgreSQL support,
diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
index 40f35532a5..d3ddab64c9 100644
--- 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, [
diff --git a/ext/xmlrpc/libxmlrpc/acinclude.m4 b/ext/xmlrpc/libxmlrpc/acinclude.m4
index 07bf4f0b07..49b6090f6b 100644
--- 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 e89c245f02..87da92db8a 100644
--- 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 402cb0b90c..0d5079bdec 100644
--- 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 20f02d8339..cd610142e9 100644
--- 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 8ed89ddf86..123acaef7f 100644
--- 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
View Lorry Controller Status