sniper Thu Dec 30 02:08:38 2004 EDT Modified files: /php-src acinclude.m4 configure.in /TSRM acinclude.m4 threads.m4 tsrm.m4 /ZendEngine2 Zend.m4 acinclude.m4 /php-src/ext/bcmath/libbcmath aclocal.m4 /php-src/ext/cpdf config.m4 /php-src/ext/dba config.m4 /php-src/ext/gd config.m4 /php-src/ext/imap config.m4 /php-src/ext/ldap config.m4 /php-src/ext/mcrypt config.m4 /php-src/ext/msql config.m4 /php-src/ext/mysql config.m4 /php-src/ext/oci8 config.m4 /php-src/ext/odbc config.m4 /php-src/ext/oracle config.m4 /php-src/ext/pgsql config.m4 /php-src/ext/standard config.m4 /php-src/ext/xmlrpc/libxmlrpc acinclude.m4 xmlrpc.m4 /php-src/sapi/cgi config9.m4 /php-src/sapi/cgi/libfcgi acinclude.m4 /php-src/scripts phpize.m4 Log: MFB_4_3: Quote macro names in AC_DEFUN()
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.282&r2=1.283&ty=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.282 php-src/acinclude.m4:1.283 --- php-src/acinclude.m4:1.282 Tue Dec 21 10:41:22 2004 +++ php-src/acinclude.m4 Thu Dec 30 02:08:35 2004 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.282 2004/12/21 15:41:22 edink Exp $ +dnl $Id: acinclude.m4,v 1.283 2004/12/30 07:08:35 sniper Exp $ dnl dnl This file contains local autoconf functions. @@ -16,7 +16,7 @@ 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 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 $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 http://cvs.php.net/diff.php/php-src/configure.in?r1=1.532&r2=1.533&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.532 php-src/configure.in:1.533 --- php-src/configure.in:1.532 Mon Dec 20 20:07:24 2004 +++ php-src/configure.in Thu Dec 30 02:08:35 2004 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.532 2004/12/21 01:07:24 sniper Exp $ -*- autoconf -*- +dnl ## $Id: configure.in,v 1.533 2004/12/30 07:08:35 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -47,10 +47,10 @@ 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 ------------------------------------------------------------------------- http://cvs.php.net/diff.php/TSRM/acinclude.m4?r1=1.1&r2=1.2&ty=u Index: TSRM/acinclude.m4 diff -u TSRM/acinclude.m4:1.1 TSRM/acinclude.m4:1.2 --- TSRM/acinclude.m4:1.1 Mon Oct 4 11:22:18 1999 +++ TSRM/acinclude.m4 Thu Dec 30 02:08:36 2004 @@ -1,5 +1,5 @@ -AC_DEFUN(AM_SET_LIBTOOL_VARIABLE,[ +AC_DEFUN([AM_SET_LIBTOOL_VARIABLE],[ LIBTOOL='$(SHELL) $(top_builddir)/libtool $1' ]) http://cvs.php.net/diff.php/TSRM/threads.m4?r1=1.12&r2=1.13&ty=u Index: TSRM/threads.m4 diff -u TSRM/threads.m4:1.12 TSRM/threads.m4:1.13 --- TSRM/threads.m4:1.12 Sat Oct 5 07:26:17 2002 +++ TSRM/threads.m4 Thu Dec 30 02:08:36 2004 @@ -30,7 +30,7 @@ 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 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 -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 @@ ])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 http://cvs.php.net/diff.php/TSRM/tsrm.m4?r1=1.15&r2=1.16&ty=u Index: TSRM/tsrm.m4 diff -u TSRM/tsrm.m4:1.15 TSRM/tsrm.m4:1.16 --- TSRM/tsrm.m4:1.15 Fri Oct 3 01:24:17 2003 +++ TSRM/tsrm.m4 Thu Dec 30 02:08:36 2004 @@ -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 @@ 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_DEFUN(TSRM_CHECK_PTH,[ +AC_DEFUN([TSRM_CHECK_PTH],[ AC_MSG_CHECKING(for GNU Pth) PTH_PREFIX="`$1 --prefix`" @@ -50,7 +50,7 @@ ]) -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 @@ sinclude(threads.m4) sinclude(TSRM/threads.m4) -AC_DEFUN(TSRM_CHECK_PTHREADS,[ +AC_DEFUN([TSRM_CHECK_PTHREADS],[ PTHREADS_CHECK @@ -89,7 +89,7 @@ ]) -AC_DEFUN(TSRM_THREADS_CHECKS,[ +AC_DEFUN([TSRM_THREADS_CHECKS],[ dnl For the thread implementations, we always use --with-* dnl to maintain consistency http://cvs.php.net/diff.php/ZendEngine2/Zend.m4?r1=1.46&r2=1.47&ty=u Index: ZendEngine2/Zend.m4 diff -u ZendEngine2/Zend.m4:1.46 ZendEngine2/Zend.m4:1.47 --- ZendEngine2/Zend.m4:1.46 Wed Nov 3 18:25:33 2004 +++ ZendEngine2/Zend.m4 Thu Dec 30 02:08:36 2004 @@ -1,10 +1,10 @@ dnl -dnl $Id: Zend.m4,v 1.46 2004/11/03 23:25:33 moriyoshi Exp $ +dnl $Id: Zend.m4,v 1.47 2004/12/30 07:08:36 sniper Exp $ 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 @@ ]) -AC_DEFUN(LIBZEND_BASIC_CHECKS,[ +AC_DEFUN([LIBZEND_BASIC_CHECKS],[ AC_REQUIRE([AC_PROG_YACC]) AC_REQUIRE([AC_PROG_CC]) @@ -58,12 +58,12 @@ 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 @@ ]) -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_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_DEFUN(LIBZEND_CPLUSPLUS_CHECKS,[ +AC_DEFUN([LIBZEND_CPLUSPLUS_CHECKS],[ ]) http://cvs.php.net/diff.php/ZendEngine2/acinclude.m4?r1=1.8&r2=1.9&ty=u Index: ZendEngine2/acinclude.m4 diff -u ZendEngine2/acinclude.m4:1.8 ZendEngine2/acinclude.m4:1.9 --- ZendEngine2/acinclude.m4:1.8 Sun Jun 18 12:51:41 2000 +++ ZendEngine2/acinclude.m4 Thu Dec 30 02:08:36 2004 @@ -1,8 +1,8 @@ -dnl $Id: acinclude.m4,v 1.8 2000/06/18 16:51:41 sascha Exp $ +dnl $Id: acinclude.m4,v 1.9 2004/12/30 07:08:36 sniper Exp $ 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 @@ 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_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' ]) http://cvs.php.net/diff.php/php-src/ext/bcmath/libbcmath/aclocal.m4?r1=1.1&r2=1.2&ty=u Index: php-src/ext/bcmath/libbcmath/aclocal.m4 diff -u php-src/ext/bcmath/libbcmath/aclocal.m4:1.1 php-src/ext/bcmath/libbcmath/aclocal.m4:1.2 --- php-src/ext/bcmath/libbcmath/aclocal.m4:1.1 Wed Nov 22 15:20:02 2000 +++ php-src/ext/bcmath/libbcmath/aclocal.m4 Thu Dec 30 02:08:36 2004 @@ -19,7 +19,7 @@ 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 @@ # 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 @@ 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 @@ # 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. http://cvs.php.net/diff.php/php-src/ext/cpdf/config.m4?r1=1.22&r2=1.23&ty=u Index: php-src/ext/cpdf/config.m4 diff -u php-src/ext/cpdf/config.m4:1.22 php-src/ext/cpdf/config.m4:1.23 --- php-src/ext/cpdf/config.m4:1.22 Mon Dec 20 23:21:43 2004 +++ php-src/ext/cpdf/config.m4 Thu Dec 30 02:08:36 2004 @@ -1,6 +1,6 @@ -dnl $Id: config.m4,v 1.22 2004/12/21 04:21:43 sniper Exp $ +dnl $Id: config.m4,v 1.23 2004/12/30 07:08:36 sniper Exp $ -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_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 http://cvs.php.net/diff.php/php-src/ext/dba/config.m4?r1=1.62&r2=1.63&ty=u Index: php-src/ext/dba/config.m4 diff -u php-src/ext/dba/config.m4:1.62 php-src/ext/dba/config.m4:1.63 --- php-src/ext/dba/config.m4:1.62 Wed Nov 3 09:32:49 2004 +++ php-src/ext/dba/config.m4 Thu Dec 30 02:08:36 2004 @@ -1,14 +1,14 @@ dnl -dnl $Id: config.m4,v 1.62 2004/11/03 14:32:49 jorton Exp $ +dnl $Id: config.m4,v 1.63 2004/12/30 07:08:36 sniper Exp $ 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 @@ ]) 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 @@ ]) 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 @@ 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_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_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_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" http://cvs.php.net/diff.php/php-src/ext/gd/config.m4?r1=1.149&r2=1.150&ty=u Index: php-src/ext/gd/config.m4 diff -u php-src/ext/gd/config.m4:1.149 php-src/ext/gd/config.m4:1.150 --- php-src/ext/gd/config.m4:1.149 Mon Dec 13 05:30:21 2004 +++ php-src/ext/gd/config.m4 Thu Dec 30 02:08:36 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.149 2004/12/13 10:30:21 jorton Exp $ +dnl $Id: config.m4,v 1.150 2004/12/30 07:08:36 sniper Exp $ dnl dnl @@ -47,7 +47,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 ]) http://cvs.php.net/diff.php/php-src/ext/imap/config.m4?r1=1.65&r2=1.66&ty=u Index: php-src/ext/imap/config.m4 diff -u php-src/ext/imap/config.m4:1.65 php-src/ext/imap/config.m4:1.66 --- php-src/ext/imap/config.m4:1.65 Sun Dec 19 13:16:50 2004 +++ php-src/ext/imap/config.m4 Thu Dec 30 02:08:36 2004 @@ -1,8 +1,8 @@ dnl -dnl $Id: config.m4,v 1.65 2004/12/19 18:16:50 iliaa Exp $ +dnl $Id: config.m4,v 1.66 2004/12/30 07:08:36 sniper Exp $ 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 @@ 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 @@ ]) 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_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_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 http://cvs.php.net/diff.php/php-src/ext/ldap/config.m4?r1=1.35&r2=1.36&ty=u Index: php-src/ext/ldap/config.m4 diff -u php-src/ext/ldap/config.m4:1.35 php-src/ext/ldap/config.m4:1.36 --- php-src/ext/ldap/config.m4:1.35 Wed Nov 3 09:32:50 2004 +++ php-src/ext/ldap/config.m4 Thu Dec 30 02:08:36 2004 @@ -1,8 +1,8 @@ dnl -dnl $Id: config.m4,v 1.35 2004/11/03 14:32:50 jorton Exp $ +dnl $Id: config.m4,v 1.36 2004/12/30 07:08:36 sniper Exp $ 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 @@ fi ]) -AC_DEFUN(PHP_LDAP_SASL_CHECKS, [ +AC_DEFUN([PHP_LDAP_SASL_CHECKS], [ if test "$1" = "yes"; then SEARCH_DIRS="/usr/local /usr" else http://cvs.php.net/diff.php/php-src/ext/mcrypt/config.m4?r1=1.28&r2=1.29&ty=u Index: php-src/ext/mcrypt/config.m4 diff -u php-src/ext/mcrypt/config.m4:1.28 php-src/ext/mcrypt/config.m4:1.29 --- php-src/ext/mcrypt/config.m4:1.28 Tue Sep 30 22:53:10 2003 +++ php-src/ext/mcrypt/config.m4 Thu Dec 30 02:08:36 2004 @@ -1,8 +1,8 @@ dnl -dnl $Id: config.m4,v 1.28 2003/10/01 02:53:10 sniper Exp $ +dnl $Id: config.m4,v 1.29 2004/12/30 07:08:36 sniper Exp $ 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) http://cvs.php.net/diff.php/php-src/ext/msql/config.m4?r1=1.12&r2=1.13&ty=u Index: php-src/ext/msql/config.m4 diff -u php-src/ext/msql/config.m4:1.12 php-src/ext/msql/config.m4:1.13 --- php-src/ext/msql/config.m4:1.12 Tue Mar 12 11:25:28 2002 +++ php-src/ext/msql/config.m4 Thu Dec 30 02:08:36 2004 @@ -1,11 +1,11 @@ dnl -dnl $Id: config.m4,v 1.12 2002/03/12 16:25:28 sas Exp $ +dnl $Id: config.m4,v 1.13 2004/12/30 07:08:36 sniper Exp $ 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" http://cvs.php.net/diff.php/php-src/ext/mysql/config.m4?r1=1.62&r2=1.63&ty=u Index: php-src/ext/mysql/config.m4 diff -u php-src/ext/mysql/config.m4:1.62 php-src/ext/mysql/config.m4:1.63 --- php-src/ext/mysql/config.m4:1.62 Wed Nov 3 09:32:50 2004 +++ php-src/ext/mysql/config.m4 Thu Dec 30 02:08:36 2004 @@ -1,8 +1,8 @@ dnl -dnl $Id: config.m4,v 1.62 2004/11/03 14:32:50 jorton Exp $ +dnl $Id: config.m4,v 1.63 2004/12/30 07:08:36 sniper Exp $ 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 @@ 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 \ http://cvs.php.net/diff.php/php-src/ext/oci8/config.m4?r1=1.52&r2=1.53&ty=u Index: php-src/ext/oci8/config.m4 diff -u php-src/ext/oci8/config.m4:1.52 php-src/ext/oci8/config.m4:1.53 --- php-src/ext/oci8/config.m4:1.52 Thu Dec 23 11:20:09 2004 +++ php-src/ext/oci8/config.m4 Thu Dec 30 02:08:37 2004 @@ -1,8 +1,8 @@ dnl -dnl $Id: config.m4,v 1.52 2004/12/23 16:20:09 tony2001 Exp $ +dnl $Id: config.m4,v 1.53 2004/12/30 07:08:37 sniper Exp $ 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(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_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_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` http://cvs.php.net/diff.php/php-src/ext/odbc/config.m4?r1=1.66&r2=1.67&ty=u Index: php-src/ext/odbc/config.m4 diff -u php-src/ext/odbc/config.m4:1.66 php-src/ext/odbc/config.m4:1.67 --- php-src/ext/odbc/config.m4:1.66 Wed Nov 3 09:32:51 2004 +++ php-src/ext/odbc/config.m4 Thu Dec 30 02:08:37 2004 @@ -1,11 +1,11 @@ dnl -dnl $Id: config.m4,v 1.66 2004/11/03 14:32:51 jorton Exp $ +dnl $Id: config.m4,v 1.67 2004/12/30 07:08:37 sniper Exp $ 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 @@ 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_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 http://cvs.php.net/diff.php/php-src/ext/oracle/config.m4?r1=1.30&r2=1.31&ty=u Index: php-src/ext/oracle/config.m4 diff -u php-src/ext/oracle/config.m4:1.30 php-src/ext/oracle/config.m4:1.31 --- php-src/ext/oracle/config.m4:1.30 Fri Oct 3 01:24:26 2003 +++ php-src/ext/oracle/config.m4 Thu Dec 30 02:08:37 2004 @@ -1,8 +1,8 @@ dnl -dnl $Id: config.m4,v 1.30 2003/10/03 05:24:26 sniper Exp $ +dnl $Id: config.m4,v 1.31 2004/12/30 07:08:37 sniper Exp $ 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` http://cvs.php.net/diff.php/php-src/ext/pgsql/config.m4?r1=1.38&r2=1.39&ty=u Index: php-src/ext/pgsql/config.m4 diff -u php-src/ext/pgsql/config.m4:1.38 php-src/ext/pgsql/config.m4:1.39 --- php-src/ext/pgsql/config.m4:1.38 Wed Nov 3 09:32:51 2004 +++ php-src/ext/pgsql/config.m4 Thu Dec 30 02:08:37 2004 @@ -1,8 +1,8 @@ dnl -dnl $Id: config.m4,v 1.38 2004/11/03 14:32:51 jorton Exp $ +dnl $Id: config.m4,v 1.39 2004/12/30 07:08:37 sniper Exp $ dnl -AC_DEFUN(PHP_PGSQL_CHECK_FUNCTIONS,[ +AC_DEFUN([PHP_PGSQL_CHECK_FUNCTIONS],[ ]) PHP_ARG_WITH(pgsql,for PostgreSQL support, http://cvs.php.net/diff.php/php-src/ext/standard/config.m4?r1=1.77&r2=1.78&ty=u Index: php-src/ext/standard/config.m4 diff -u php-src/ext/standard/config.m4:1.77 php-src/ext/standard/config.m4:1.78 --- php-src/ext/standard/config.m4:1.77 Tue Nov 9 10:58:16 2004 +++ php-src/ext/standard/config.m4 Thu Dec 30 02:08:37 2004 @@ -1,11 +1,11 @@ -dnl $Id: config.m4,v 1.77 2004/11/09 15:58:16 jorton Exp $ -*- autoconf -*- +dnl $Id: config.m4,v 1.78 2004/12/30 07:08:37 sniper Exp $ -*- autoconf -*- 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 @@ 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, [ http://cvs.php.net/diff.php/php-src/ext/xmlrpc/libxmlrpc/acinclude.m4?r1=1.2&r2=1.3&ty=u Index: php-src/ext/xmlrpc/libxmlrpc/acinclude.m4 diff -u php-src/ext/xmlrpc/libxmlrpc/acinclude.m4:1.2 php-src/ext/xmlrpc/libxmlrpc/acinclude.m4:1.3 --- php-src/ext/xmlrpc/libxmlrpc/acinclude.m4:1.2 Thu Sep 6 05:36:57 2001 +++ php-src/ext/xmlrpc/libxmlrpc/acinclude.m4 Thu Dec 30 02:08:37 2004 @@ -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_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]) http://cvs.php.net/diff.php/php-src/ext/xmlrpc/libxmlrpc/xmlrpc.m4?r1=1.3&r2=1.4&ty=u Index: php-src/ext/xmlrpc/libxmlrpc/xmlrpc.m4 diff -u php-src/ext/xmlrpc/libxmlrpc/xmlrpc.m4:1.3 php-src/ext/xmlrpc/libxmlrpc/xmlrpc.m4:1.4 --- php-src/ext/xmlrpc/libxmlrpc/xmlrpc.m4:1.3 Thu Mar 7 09:19:43 2002 +++ php-src/ext/xmlrpc/libxmlrpc/xmlrpc.m4 Thu Dec 30 02:08:37 2004 @@ -1,4 +1,4 @@ -AC_DEFUN(XMLRPC_CHECKS,[ +AC_DEFUN([XMLRPC_CHECKS],[ AC_REQUIRE([AC_PROG_CC]) AC_REQUIRE([AC_PROG_LN_S]) http://cvs.php.net/diff.php/php-src/sapi/cgi/config9.m4?r1=1.12&r2=1.13&ty=u Index: php-src/sapi/cgi/config9.m4 diff -u php-src/sapi/cgi/config9.m4:1.12 php-src/sapi/cgi/config9.m4:1.13 --- php-src/sapi/cgi/config9.m4:1.12 Mon Dec 1 10:17:08 2003 +++ php-src/sapi/cgi/config9.m4 Thu Dec 30 02:08:37 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config9.m4,v 1.12 2003/12/01 15:17:08 sniper Exp $ +dnl $Id: config9.m4,v 1.13 2004/12/30 07:08:37 sniper Exp $ dnl AC_ARG_ENABLE(cgi, @@ -51,7 +51,7 @@ 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 http://cvs.php.net/diff.php/php-src/sapi/cgi/libfcgi/acinclude.m4?r1=1.2&r2=1.3&ty=u Index: php-src/sapi/cgi/libfcgi/acinclude.m4 diff -u php-src/sapi/cgi/libfcgi/acinclude.m4:1.2 php-src/sapi/cgi/libfcgi/acinclude.m4:1.3 --- php-src/sapi/cgi/libfcgi/acinclude.m4:1.2 Mon Dec 2 00:24:54 2002 +++ php-src/sapi/cgi/libfcgi/acinclude.m4 Thu Dec 30 02:08:37 2004 @@ -1,6 +1,6 @@ -dnl $Id: acinclude.m4,v 1.2 2002/12/02 05:24:54 shane Exp $ +dnl $Id: acinclude.m4,v 1.3 2004/12/30 07:08:37 sniper Exp $ -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]) @@ -101,7 +101,7 @@ dnl macros posted by AFC to the autoconf macro repository. We are also dnl grateful for the helpful feedback of numerous users. dnl -dnl @version $Id: acinclude.m4,v 1.2 2002/12/02 05:24:54 shane Exp $ +dnl @version $Id: acinclude.m4,v 1.3 2004/12/30 07:08:37 sniper Exp $ dnl @author Steven G. Johnson <[EMAIL PROTECTED]> and Alejandro Forero Cuervo <[EMAIL PROTECTED]> AC_DEFUN([ACX_PTHREAD], [ @@ -302,7 +302,7 @@ dnl Digital Unix C compiler, C for AIX Compiler, HP-UX C compiler, dnl and IRIX C compiler. dnl -dnl @version $Id: acinclude.m4,v 1.2 2002/12/02 05:24:54 shane Exp $ +dnl @version $Id: acinclude.m4,v 1.3 2004/12/30 07:08:37 sniper Exp $ dnl @author Ville Laurikari <[EMAIL PROTECTED]> dnl AC_DEFUN([AC_PROG_CC_WARNINGS], [ http://cvs.php.net/diff.php/php-src/scripts/phpize.m4?r1=1.7&r2=1.8&ty=u Index: php-src/scripts/phpize.m4 diff -u php-src/scripts/phpize.m4:1.7 php-src/scripts/phpize.m4:1.8 --- php-src/scripts/phpize.m4:1.7 Wed Sep 3 04:08:12 2003 +++ php-src/scripts/phpize.m4 Thu Dec 30 02:08:37 2004 @@ -6,7 +6,7 @@ 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_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
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php