sniper Tue Mar 27 12:34:51 2001 EDT Modified files: /php4 acinclude.m4 configure.in /php4/ext/aspell config.m4 /php4/ext/bz2 config.m4 /php4/ext/ccvs config.m4 /php4/ext/cpdf config.m4 /php4/ext/crack config.m4 /php4/ext/curl config.m4 /php4/ext/cybercash config.m4 /php4/ext/cybermut config.m4 /php4/ext/dba config.m4 /php4/ext/domxml config.m4 /php4/ext/fbsql config.m4 /php4/ext/fdf config.m4 /php4/ext/fribidi config.m4 /php4/ext/gd config.m4 /php4/ext/gettext config.m4 /php4/ext/gmp config.m4 /php4/ext/icap config.m4 /php4/ext/iconv config.m4 /php4/ext/imap config.m4 /php4/ext/informix config.m4 /php4/ext/ingres_ii config.m4 /php4/ext/interbase config.m4 /php4/ext/ircg config.m4 /php4/ext/java config.m4 /php4/ext/ldap config.m4 /php4/ext/mcal config.m4 /php4/ext/mcrypt config.m4 /php4/ext/mhash config.m4 /php4/ext/midgard config.m4 config.m4.session /php4/ext/ming config.m4 /php4/ext/mnogosearch config.m4 /php4/ext/msql config.m4 /php4/ext/muscat config.m4 /php4/ext/mysql config.m4 /php4/ext/oci8 config.m4 /php4/ext/odbc config.m4 /php4/ext/oracle config.m4 /php4/ext/ovrimos config.m4 /php4/ext/pcre config.m4 /php4/ext/pdf config.m4 /php4/ext/pfpro config.m4 /php4/ext/pgsql config.m4 /php4/ext/pspell config.m4 /php4/ext/qtdom config.m4 /php4/ext/readline config.m4 /php4/ext/recode config.m4 /php4/ext/sablot config.m4 /php4/ext/session config.m4 /php4/ext/snmp config.m4 /php4/ext/swf config.m4 /php4/ext/sybase config.m4 /php4/ext/sybase_ct config.m4 /php4/ext/vpopmail config.m4 /php4/ext/xml config.m4 /php4/ext/zlib config.m4 /php4/ext/zziplib config.m4 /php4/sapi/aolserver config.m4 /php4/sapi/apache config.m4 /php4/sapi/apache2filter config.m4 /php4/sapi/caudium config.m4 /php4/sapi/fastcgi config.m4 /php4/sapi/isapi config.m4 /php4/sapi/nsapi config.m4 /php4/sapi/phttpd config.m4 /php4/sapi/pi3web config.m4 /php4/sapi/roxen config.m4 /php4/sapi/thttpd config.m4 Log: Renamed the AC_ prefixed macros defined in acinclude.m4 to PHP_* prefixes. # Heads up people! I tested this before committing but you never know..
Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.121 php4/acinclude.m4:1.122 --- php4/acinclude.m4:1.121 Tue Feb 20 23:39:13 2001 +++ php4/acinclude.m4 Tue Mar 27 12:34:20 2001 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.121 2001/02/21 07:39:13 sas Exp $ +dnl $Id: acinclude.m4,v 1.122 2001/03/27 20:34:20 sniper Exp $ dnl dnl This file contains local autoconf functions. @@ -35,20 +35,20 @@ ]) CPPFLAGS=$old_CPPFLAGS - AC_ADD_LIBPATH($OPENSSL_DIR/lib) + PHP_ADD_LIBPATH($OPENSSL_DIR/lib) AC_CHECK_LIB(crypto, CRYPTO_free, [ - AC_ADD_LIBRARY(crypto) + PHP_ADD_LIBRARY(crypto) ],[ AC_MSG_ERROR(libcrypto not found!) ]) AC_CHECK_LIB(ssl, SSL_CTX_set_ssl_version, [ - AC_ADD_LIBRARY(ssl) + PHP_ADD_LIBRARY(ssl) ],[ AC_MSG_ERROR(libssl not found!) ]) - AC_ADD_INCLUDE($OPENSSL_INC) + PHP_ADD_INCLUDE($OPENSSL_INC) ]) dnl PHP_EVAL_LIBLINE(LINE, SHARED-LIBADD) @@ -62,11 +62,11 @@ case "$ac_i" in -l*) ac_ii=`echo $ac_i|cut -c 3-` - AC_ADD_LIBRARY($ac_ii,,$2) + PHP_ADD_LIBRARY($ac_ii,,$2) ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - AC_ADD_LIBPATH($ac_ii,$2) + PHP_ADD_LIBPATH($ac_ii,$2) ;; esac done @@ -82,7 +82,7 @@ case "$ac_i" in -I*) ac_ii=`echo $ac_i|cut -c 3-` - AC_ADD_INCLUDE($ac_ii) + PHP_ADD_INCLUDE($ac_ii) ;; esac done @@ -522,11 +522,11 @@ ]) dnl -dnl AC_EXPAND_PATH(path, variable) +dnl PHP_EXPAND_PATH(path, variable) dnl dnl expands path to an absolute path and assigns it to variable dnl -AC_DEFUN(AC_EXPAND_PATH,[ +AC_DEFUN(PHP_EXPAND_PATH,[ if test -z "$1" || echo "$1" | grep '^/' >/dev/null ; then $2="$1" else @@ -539,13 +539,13 @@ ]) dnl -dnl AC_ADD_LIBPATH(path[, shared-libadd]) +dnl PHP_ADD_LIBPATH(path[, shared-libadd]) dnl dnl add a library to linkpath/runpath dnl -AC_DEFUN(AC_ADD_LIBPATH,[ +AC_DEFUN(PHP_ADD_LIBPATH,[ if test "$1" != "/usr/lib"; then - AC_EXPAND_PATH($1, ai_p) + PHP_EXPAND_PATH($1, ai_p) if test "$ext_shared" = "yes" && test -n "$2"; then $2="-R$1 -L$1 [$]$2" else @@ -559,11 +559,11 @@ ]) dnl -dnl AC_BUILD_RPATH() +dnl PHP_BUILD_RPATH() dnl dnl builds RPATH from PHP_RPATHS dnl -AC_DEFUN(AC_BUILD_RPATH,[ +AC_DEFUN(PHP_BUILD_RPATH,[ if test "$PHP_RPATH" = "yes" && test -n "$PHP_RPATHS"; then OLD_RPATHS="$PHP_RPATHS" PHP_RPATHS="" @@ -576,13 +576,13 @@ ]) dnl -dnl AC_ADD_INCLUDE(path) +dnl PHP_ADD_INCLUDE(path) dnl dnl add a include path dnl -AC_DEFUN(AC_ADD_INCLUDE,[ +AC_DEFUN(PHP_ADD_INCLUDE,[ if test "$1" != "/usr/include"; then - AC_EXPAND_PATH($1, ai_p) + PHP_EXPAND_PATH($1, ai_p) AC_PHP_ONCE(INCLUDEPATH, $ai_p, [ INCLUDES="$INCLUDES -I$ai_p" ]) @@ -594,11 +594,11 @@ ]) dnl -dnl AC_ADD_LIBRARY(library[, append[, shared-libadd]]) +dnl PHP_ADD_LIBRARY(library[, append[, shared-libadd]]) dnl dnl add a library to the link line dnl -AC_DEFUN(AC_ADD_LIBRARY,[ +AC_DEFUN(PHP_ADD_LIBRARY,[ case "$1" in c|c_r|pthread*) ;; *) @@ -608,7 +608,7 @@ if test "$ext_shared" = "yes"; then PHP_X_ADD_LIBRARY($1,$2,$3) else - AC_ADD_LIBRARY($1,$2) + PHP_ADD_LIBRARY($1,$2) fi ]) ;; @@ -616,49 +616,52 @@ ]) dnl -dnl AC_ADD_LIBRARY_DEFER(library[, append]) +dnl PHP_ADD_LIBRARY_DEFER(library[, append]) dnl dnl add a library to the link line (deferred) -AC_DEFUN(AC_ADD_LIBRARY_DEFER,[ +AC_DEFUN(PHP_ADD_LIBRARY_DEFER,[ ifelse($#, 1, DLIBS="-l$1 $DLIBS", DLIBS="$DLIBS -l$1") ]) dnl -dnl AC_ADD_LIBRARY_WITH_PATH(library, path[, shared-libadd]) +dnl PHP_ADD_LIBRARY_WITH_PATH(library, path[, shared-libadd]) dnl dnl add a library to the link line and path to linkpath/runpath. dnl if shared-libadd is not empty and $ext_shared is yes, dnl shared-libadd will be assigned the library information dnl -AC_DEFUN(AC_ADD_LIBRARY_WITH_PATH,[ +AC_DEFUN(PHP_ADD_LIBRARY_WITH_PATH,[ ifelse($3,,[ if test -n "$2"; then - AC_ADD_LIBPATH($2) + PHP_ADD_LIBPATH($2) fi - AC_ADD_LIBRARY($1) + PHP_ADD_LIBRARY($1) ],[ if test "$ext_shared" = "yes"; then $3="-l$1 [$]$3" if test -n "$2"; then - AC_ADD_LIBPATH($2,$3) + PHP_ADD_LIBPATH($2,$3) fi else - AC_ADD_LIBRARY_WITH_PATH($1,$2) + PHP_ADD_LIBRARY_WITH_PATH($1,$2) fi ]) ]) dnl -dnl AC_ADD_LIBRARY_DEFER_WITH_PATH(library, path) +dnl PHP_ADD_LIBRARY_DEFER_WITH_PATH(library, path) dnl dnl add a library to the link line (deferred) dnl and path to linkpath/runpath (not deferred) dnl -AC_DEFUN(AC_ADD_LIBRARY_DEFER_WITH_PATH,[ - AC_ADD_LIBPATH($2) - AC_ADD_LIBRARY_DEFER($1) +AC_DEFUN(PHP_ADD_LIBRARY_DEFER_WITH_PATH,[ + PHP_ADD_LIBPATH($2) + PHP_ADD_LIBRARY_DEFER($1) ]) +dnl +dnl Set libtool variable +dnl AC_DEFUN(AM_SET_LIBTOOL_VARIABLE,[ LIBTOOL='$(SHELL) $(top_builddir)/libtool $1' ]) @@ -666,7 +669,7 @@ dnl dnl Check for cc option dnl -AC_DEFUN(AC_CHECK_CC_OPTION,[ +AC_DEFUN(PHP_CHECK_CC_OPTION,[ echo "main(){return 0;}" > conftest.$ac_ext opt="$1" changequote({,}) @@ -711,7 +714,7 @@ dnl dnl See if we have broken header files like SunOS has. dnl -AC_DEFUN(AC_MISSING_FCLOSE_DECL,[ +AC_DEFUN(PHP_MISSING_FCLOSE_DECL,[ AC_MSG_CHECKING([for fclose declaration]) AC_TRY_COMPILE([#include <stdio.h>],[int (*func)() = fclose],[ AC_DEFINE(MISSING_FCLOSE_DECL,0,[ ]) @@ -725,7 +728,7 @@ dnl dnl Check for broken sprintf() dnl -AC_DEFUN(AC_BROKEN_SPRINTF,[ +AC_DEFUN(PHP_AC_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 @@ -842,7 +845,7 @@ dnl Written by Paul Eggert <[EMAIL PROTECTED]>. -AC_DEFUN(AC_SYS_LFS, +AC_DEFUN(PHP_SYS_LFS, [dnl # If available, prefer support for large files unless the user specified # one of the CPPFLAGS, LDFLAGS, or LIBS variables. @@ -877,7 +880,7 @@ esac ]) -AC_DEFUN(AC_SOCKADDR_SA_LEN,[ +AC_DEFUN(PHP_SOCKADDR_SA_LEN,[ AC_CACHE_CHECK([for field sa_len in struct sockaddr],ac_cv_sockaddr_sa_len,[ AC_TRY_COMPILE([#include <sys/types.h> #include <sys/socket.h>], Index: php4/configure.in diff -u php4/configure.in:1.225 php4/configure.in:1.226 --- php4/configure.in:1.225 Mon Mar 26 13:34:59 2001 +++ php4/configure.in Tue Mar 27 12:34:22 2001 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.225 2001/03/26 21:34:59 sniper Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.226 2001/03/27 20:34:22 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -213,10 +213,10 @@ AC_CHECK_LIB(socket, socket, [ - AC_ADD_LIBRARY(socket) + PHP_ADD_LIBRARY(socket) AC_DEFINE(HAVE_LIBSOCKET,1,[ ]) ], [ AC_CHECK_LIB(socket, htonl, [ - AC_ADD_LIBRARY(socket) + PHP_ADD_LIBRARY(socket) ])]) dnl Some systems (OpenServer 5) dislike -lsocket -lnsl, so we try @@ -231,27 +231,27 @@ if test "$php_no_nsl_checks" != "yes"; then AC_CHECK_LIB(nsl, gethostname, [ - AC_ADD_LIBRARY(nsl) + PHP_ADD_LIBRARY(nsl) AC_DEFINE(HAVE_LIBNSL,1,[ ]) ],[ AC_CHECK_LIB(nsl, gethostbyaddr, [ - AC_ADD_LIBRARY(nsl) + PHP_ADD_LIBRARY(nsl) AC_DEFINE(HAVE_LIBNSL,1,[ ]) ], []) ]) fi AC_CHECK_LIB(crypt, crypt, [ - AC_ADD_LIBRARY(crypt) + PHP_ADD_LIBRARY(crypt) AC_DEFINE(HAVE_LIBCRYPT,1,[ ]) ], []) -AC_CHECK_LIB(dl, dlopen,[AC_ADD_LIBRARY(dl)]) +AC_CHECK_LIB(dl, dlopen,[PHP_ADD_LIBRARY(dl)]) dnl The sin may be in a library which need not be specifed dnl as well as res_search resides in libsocket AC_CHECK_LIB(m, sin) AC_CHECK_LIB(bind, inet_aton, [ - AC_ADD_LIBRARY(bind) + PHP_ADD_LIBRARY(bind) AC_DEFINE(HAVE_LIBBIND,1,[Whether you have bind]) ], [ AC_CHECK_LIB(bind, __inet_aton, [], [ AC_CHECK_LIB(resolv, inet_aton) @@ -285,7 +285,7 @@ else AC_CHECK_HEADERS(dirent.h) fi -AC_MISSING_FCLOSE_DECL +PHP_MISSING_FCLOSE_DECL dnl QNX requires unix.h to allow functions in libunix to work properly AC_CHECK_HEADERS( alloca.h \ @@ -334,7 +334,7 @@ AC_CHECK_SIZEOF(long, 8) AC_CHECK_SIZEOF(int, 4) -test -d /usr/ucblib && AC_ADD_LIBPATH(/usr/ucblib) +test -d /usr/ucblib && PHP_ADD_LIBPATH(/usr/ucblib) dnl Check for members of the stat structure AC_STRUCT_ST_BLKSIZE @@ -435,7 +435,7 @@ AC_REPLACE_FUNCS(strlcat strlcpy getopt) AC_FUNC_UTIME_NULL AC_FUNC_ALLOCA -AC_BROKEN_SPRINTF +PHP_AC_BROKEN_SPRINTF PHP_DECLARED_TIMEZONE PHP_TIME_R_TYPE PHP_READDIR_R_TYPE @@ -566,8 +566,8 @@ if test -z "$libgcc_libpath"; then AC_MSG_ERROR(Cannot locate libgcc. Make sure that gcc is in your path) fi - AC_ADD_LIBPATH($libgcc_libpath) - AC_ADD_LIBRARY(gcc, yes) + PHP_ADD_LIBPATH($libgcc_libpath) + PHP_ADD_LIBRARY(gcc, yes) fi PHP_ARG_ENABLE(short-tags,whether to enable short tags by default, @@ -589,7 +589,7 @@ if test "$PHP_DMALLOC" = "yes"; then AC_DEFINE(HAVE_DMALLOC,1,[Whether you have dmalloc]) - AC_ADD_LIBRARY(dmalloc) + PHP_ADD_LIBRARY(dmalloc) CPPFLAGS="$CPPFLAGS -DDMALLOC_FUNC_CHECK" fi @@ -720,7 +720,7 @@ INCLUDE_PATH=".:$PEAR_INSTALLDIR" -AC_BUILD_RPATH +PHP_BUILD_RPATH EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS" Index: php4/ext/aspell/config.m4 diff -u php4/ext/aspell/config.m4:1.3 php4/ext/aspell/config.m4:1.4 --- php4/ext/aspell/config.m4:1.3 Wed Dec 29 20:07:17 1999 +++ php4/ext/aspell/config.m4 Tue Mar 27 12:34:22 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.3 1999/12/30 04:07:17 sas Exp $ +dnl $Id: config.m4,v 1.4 2001/03/27 20:34:22 sniper Exp $ AC_MSG_CHECKING(for ASPELL support) AC_ARG_WITH(aspell, @@ -11,8 +11,8 @@ ASPELL_DIR=$withval fi - AC_ADD_INCLUDE($ASPELL_DIR/include) - AC_ADD_LIBRARY_WITH_PATH(aspell, $ASPELL_DIR/lib) + PHP_ADD_INCLUDE($ASPELL_DIR/include) + PHP_ADD_LIBRARY_WITH_PATH(aspell, $ASPELL_DIR/lib) if test ! -f "$ASPELL_DIR/include/aspell-c.h"; then AC_MSG_ERROR(Could not find aspell-c.h in $ASPELL_DIR/include - please copy it manually from the aspell sources to $ASPELL_DIR/include) Index: php4/ext/bz2/config.m4 diff -u php4/ext/bz2/config.m4:1.3 php4/ext/bz2/config.m4:1.4 --- php4/ext/bz2/config.m4:1.3 Sat Jan 20 20:00:32 2001 +++ php4/ext/bz2/config.m4 Tue Mar 27 12:34:22 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.3 2001/01/21 04:00:32 sniper Exp $ +dnl $Id: config.m4,v 1.4 2001/03/27 20:34:22 sniper Exp $ dnl config.m4 for extension BZip2 PHP_ARG_WITH(bz2, for BZip2 support, @@ -22,10 +22,10 @@ AC_MSG_ERROR(Please reinstall the BZip2 distribution) fi - AC_ADD_INCLUDE($BZIP_DIR/include) + PHP_ADD_INCLUDE($BZIP_DIR/include) PHP_SUBST(BZ2_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(bz2, $BZIP_DIR/lib, BZ2_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(bz2, $BZIP_DIR/lib, BZ2_SHARED_LIBADD) AC_CHECK_LIB(bz2, BZ2_bzerror, [AC_DEFINE(HAVE_BZ2,1,[ ])], [AC_MSG_ERROR(bz2 module requires libbz2 >= 1.0.0)],) PHP_EXTENSION(bz2, $ext_shared) Index: php4/ext/ccvs/config.m4 diff -u php4/ext/ccvs/config.m4:1.6 php4/ext/ccvs/config.m4:1.7 --- php4/ext/ccvs/config.m4:1.6 Wed Dec 6 09:34:56 2000 +++ php4/ext/ccvs/config.m4 Tue Mar 27 12:34:22 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.6 2000/12/06 17:34:56 sas Exp $ +dnl $Id: config.m4,v 1.7 2001/03/27 20:34:22 sniper Exp $ dnl config.m4 for PHP4 CCVS Extension AC_MSG_CHECKING(CCVS Support) @@ -15,8 +15,8 @@ AC_MSG_RESULT(yes) PHP_EXTENSION(ccvs) LIBS="$LIBS -L$CCVS_LIB_DIR" - AC_ADD_LIBRARY_WITH_PATH(ccvs, $CCVS_LIB_DIR) - AC_ADD_INCLUDE($CCVS_INCLUDE_DIR) + PHP_ADD_LIBRARY_WITH_PATH(ccvs, $CCVS_LIB_DIR) + PHP_ADD_INCLUDE($CCVS_INCLUDE_DIR) else AC_MSG_RESULT(no) fi Index: php4/ext/cpdf/config.m4 diff -u php4/ext/cpdf/config.m4:1.4 php4/ext/cpdf/config.m4:1.5 --- php4/ext/cpdf/config.m4:1.4 Tue May 16 01:21:10 2000 +++ php4/ext/cpdf/config.m4 Tue Mar 27 12:34:23 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.4 2000/05/16 08:21:10 sas Exp $ +dnl $Id: config.m4,v 1.5 2001/03/27 20:34:23 sniper Exp $ AC_MSG_CHECKING(whether to include cpdflib support) AC_ARG_WITH(cpdflib, @@ -14,9 +14,9 @@ PHP_EXTENSION(cpdf) AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])], [AC_MSG_ERROR(Cpdf module requires cpdflib >= 2.)]) - AC_ADD_LIBRARY(cpdf) - AC_ADD_LIBRARY(tiff) - AC_ADD_LIBRARY(jpeg) + PHP_ADD_LIBRARY(cpdf) + PHP_ADD_LIBRARY(tiff) + PHP_ADD_LIBRARY(jpeg) ;; *) test -f $withval/include/cpdflib.h && CPDFLIB_INCLUDE="$withval/include" @@ -35,7 +35,7 @@ fi LIBS="$LIBS -L$withval/lib" AC_CHECK_LIB(jpeg,jpeg_read_header, ,[AC_MSG_RESULT(no)],) - AC_ADD_LIBRARY_WITH_PATH(jpeg, $withval/lib) + PHP_ADD_LIBRARY_WITH_PATH(jpeg, $withval/lib) ],[ AC_MSG_RESULT(no) AC_MSG_WARN(If configure fails try --with-jpeg-dir=<DIR>) @@ -50,7 +50,7 @@ fi LIBS="$LIBS -L$withval/lib" AC_CHECK_LIB(tiff,TIFFOpen, ,[AC_MSG_RESULT(no)],) - AC_ADD_LIBRARY_WITH_PATH(tiff, $withval/lib) + PHP_ADD_LIBRARY_WITH_PATH(tiff, $withval/lib) ],[ AC_MSG_RESULT(no) AC_MSG_WARN(If configure fails try --with-tiff-dir=<DIR>) @@ -61,8 +61,8 @@ AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])], [AC_MSG_ERROR(Cpdflib module requires cpdflib >= 2.)]) LIBS=$old_LIBS - AC_ADD_LIBRARY_WITH_PATH(cpdf, $withval/lib) - AC_ADD_INCLUDE($CPDFLIB_INCLUDE) + PHP_ADD_LIBRARY_WITH_PATH(cpdf, $withval/lib) + PHP_ADD_INCLUDE($CPDFLIB_INCLUDE) else AC_MSG_RESULT(no) fi ;; Index: php4/ext/crack/config.m4 diff -u php4/ext/crack/config.m4:1.1 php4/ext/crack/config.m4:1.2 --- php4/ext/crack/config.m4:1.1 Sat Dec 2 03:59:20 2000 +++ php4/ext/crack/config.m4 Tue Mar 27 12:34:23 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.1 2000/12/02 11:59:20 sasha Exp $ +dnl $Id: config.m4,v 1.2 2001/03/27 20:34:23 sniper Exp $ PHP_ARG_WITH(crack, whether to include crack support, [ --with-crack[=DIR] Include crack support.]) @@ -22,8 +22,8 @@ AC_MSG_ERROR(Cannot find a cracklib header file) fi - AC_ADD_INCLUDE($CRACK_INCLUDEDIR) - AC_ADD_LIBRARY_WITH_PATH(crack, $CRACK_LIBDIR) + PHP_ADD_INCLUDE($CRACK_INCLUDEDIR) + PHP_ADD_LIBRARY_WITH_PATH(crack, $CRACK_LIBDIR) PHP_EXTENSION(crack, $ext_shared) Index: php4/ext/curl/config.m4 diff -u php4/ext/curl/config.m4:1.4 php4/ext/curl/config.m4:1.5 --- php4/ext/curl/config.m4:1.4 Sat Mar 10 16:49:16 2001 +++ php4/ext/curl/config.m4 Tue Mar 27 12:34:23 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.4 2001/03/11 00:49:16 sniper Exp $ +dnl $Id: config.m4,v 1.5 2001/03/27 20:34:23 sniper Exp $ dnl config.m4 for extension CURL PHP_ARG_WITH(curl, for CURL support, @@ -23,10 +23,10 @@ easy.h should be in <curl-dir>/include/curl/) fi - AC_ADD_INCLUDE($CURL_DIR/include) + PHP_ADD_INCLUDE($CURL_DIR/include) PHP_SUBST(CURL_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/lib, CURL_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/lib, CURL_SHARED_LIBADD) AC_CHECK_LIB(curl,curl_easy_perform, [ Index: php4/ext/cybercash/config.m4 diff -u php4/ext/cybercash/config.m4:1.6 php4/ext/cybercash/config.m4:1.7 --- php4/ext/cybercash/config.m4:1.6 Mon Oct 2 10:35:57 2000 +++ php4/ext/cybercash/config.m4 Tue Mar 27 12:34:24 2001 @@ -17,8 +17,8 @@ AC_CHECK_LIB(mckcrypto,base64_encode,[AC_DEFINE(HAVE_MCK,1,[ ])], [AC_MSG_ERROR(Please reinstall the CyberCash MCK - cannot find mckcrypto lib)]) LIBS="$old_LIBS" - AC_ADD_LIBRARY_WITH_PATH(mckcrypto, $MCK_DIR/lib) - AC_ADD_INCLUDE($MCK_DIR) + PHP_ADD_LIBRARY_WITH_PATH(mckcrypto, $MCK_DIR/lib) + PHP_ADD_INCLUDE($MCK_DIR) else AC_MSG_RESULT(no) fi Index: php4/ext/cybermut/config.m4 diff -u php4/ext/cybermut/config.m4:1.1 php4/ext/cybermut/config.m4:1.2 --- php4/ext/cybermut/config.m4:1.1 Fri Mar 2 06:36:29 2001 +++ php4/ext/cybermut/config.m4 Tue Mar 27 12:34:24 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.1 2001/03/02 14:36:29 zeev Exp $ +dnl $Id: config.m4,v 1.2 2001/03/27 20:34:24 sniper Exp $ dnl config.m4 for extension cybermut @@ -37,10 +37,10 @@ AC_MSG_RESULT(linking libcm-mac.a with libcybermut.a) ln -sf $CYBERMUT_LIB_DIR/libcm-mac.a $CYBERMUT_LIB_DIR/libcybermut.a - AC_ADD_INCLUDE($CYBERMUT_INC_DIR) + PHP_ADD_INCLUDE($CYBERMUT_INC_DIR) PHP_SUBST(CYBERMUT_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(cybermut, $CYBERMUT_LIB_DIR, CYBERMUT_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(cybermut, $CYBERMUT_LIB_DIR, CYBERMUT_SHARED_LIBADD) AC_DEFINE(HAVE_CYBERMUT, 1, [ ]) Index: php4/ext/dba/config.m4 diff -u php4/ext/dba/config.m4:1.10 php4/ext/dba/config.m4:1.11 --- php4/ext/dba/config.m4:1.10 Fri Oct 20 17:35:10 2000 +++ php4/ext/dba/config.m4 Tue Mar 27 12:34:24 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.10 2000/10/21 00:35:10 sniper Exp $ +dnl $Id: config.m4,v 1.11 2001/03/27 20:34:24 sniper Exp $ dnl config.m4 for extension dba dnl don't forget to call PHP_EXTENSION(dba) @@ -31,8 +31,8 @@ dnl Attach THIS_x to DBA_x AC_DEFUN(AC_DBA_STD_ATTACH,[ - AC_ADD_INCLUDE($THIS_INCLUDE) - AC_ADD_LIBRARY_WITH_PATH($THIS_LIBS, $THIS_LFLAGS, DBA_SHARED_LIBADD) + PHP_ADD_INCLUDE($THIS_INCLUDE) + PHP_ADD_LIBRARY_WITH_PATH($THIS_LIBS, $THIS_LFLAGS, DBA_SHARED_LIBADD) THIS_INCLUDE="" THIS_LIBS="" Index: php4/ext/domxml/config.m4 diff -u php4/ext/domxml/config.m4:1.21 php4/ext/domxml/config.m4:1.22 --- php4/ext/domxml/config.m4:1.21 Wed Feb 7 08:01:29 2001 +++ php4/ext/domxml/config.m4 Tue Mar 27 12:34:25 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.21 2001/02/07 16:01:29 sas Exp $ +dnl $Id: config.m4,v 1.22 2001/03/27 20:34:25 sniper Exp $ dnl config.m4 for extension domxml AC_DEFUN(PHP_DOM_CHECK_VERSION,[ @@ -44,7 +44,7 @@ PHP_DOM_CHECK_VERSION - AC_ADD_INCLUDE($DOMXML_DIR/include) + PHP_ADD_INCLUDE($DOMXML_DIR/include) if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.s? ; then DOM_LIBNAME="xml2" @@ -53,7 +53,7 @@ fi PHP_SUBST(DOMXML_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD) if test $HAVE_ZLIB; then AC_MSG_CHECKING([for zlib (needed by DOM support)]) @@ -65,7 +65,7 @@ fi LIBS="$LIBS -L$withval/lib -lz" AC_CHECK_LIB(z,deflate, ,[AC_MSG_RESULT(no)],) - AC_ADD_LIBRARY_WITH_PATH(z, $withval/lib) + PHP_ADD_LIBRARY_WITH_PATH(z, $withval/lib) ],[ AC_MSG_RESULT(no) AC_MSG_WARN(If configure fails try --with-zlib=<DIR>) @@ -76,7 +76,7 @@ fi AC_DEFINE(HAVE_DOMXML,1,[ ]) - AC_ADD_LIBRARY(z) + PHP_ADD_LIBRARY(z) PHP_EXTENSION(domxml, $ext_shared) fi Index: php4/ext/fbsql/config.m4 diff -u php4/ext/fbsql/config.m4:1.4 php4/ext/fbsql/config.m4:1.5 --- php4/ext/fbsql/config.m4:1.4 Tue Mar 13 14:50:02 2001 +++ php4/ext/fbsql/config.m4 Tue Mar 27 12:34:25 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.4 2001/03/13 22:50:02 sniper Exp $ +dnl $Id: config.m4,v 1.5 2001/03/27 20:34:25 sniper Exp $ PHP_ARG_WITH(fbsql, for FrontBase SQL92 (fbsql) support, [ --with-fbsql[=DIR] Include FrontBase support. DIR is the FrontBase base @@ -36,6 +36,6 @@ AC_MSG_ERROR(Could not find $FBSQL_INSTALLATION_DIR/lib/libFBCAccess.a) fi - AC_ADD_LIBRARY_WITH_PATH(FBCAccess, $FBSQL_INSTALLATION_DIR/lib, $FBSQL_INSTALLATION_DIR/lib) - AC_ADD_INCLUDE($FBSQL_INSTALLATION_DIR/include) + PHP_ADD_LIBRARY_WITH_PATH(FBCAccess, $FBSQL_INSTALLATION_DIR/lib, +$FBSQL_INSTALLATION_DIR/lib) + PHP_ADD_INCLUDE($FBSQL_INSTALLATION_DIR/include) fi Index: php4/ext/fdf/config.m4 diff -u php4/ext/fdf/config.m4:1.9 php4/ext/fdf/config.m4:1.10 --- php4/ext/fdf/config.m4:1.9 Thu Nov 23 02:55:51 2000 +++ php4/ext/fdf/config.m4 Tue Mar 27 12:34:25 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.9 2000/11/23 10:55:51 steinm Exp $ +dnl $Id: config.m4,v 1.10 2001/03/27 20:34:25 sniper Exp $ PHP_ARG_WITH(fdftk, for fdftk support, [ --with-fdftk[=DIR] Include fdftk support]) @@ -21,7 +21,7 @@ AC_MSG_ERROR(Please reinstall the fdftk distribution) fi - AC_ADD_INCLUDE($FDFTK_DIR/include) + PHP_ADD_INCLUDE($FDFTK_DIR/include) old_LIBS=$LIBS LIBS="$LIBS -L$FDFTK_DIR/lib -lm" @@ -30,7 +30,7 @@ LIBS=$old_LIBS PHP_SUBST(FDFTK_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(FdfTk, $FDFTK_DIR/lib, FDFTK_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(FdfTk, $FDFTK_DIR/lib, FDFTK_SHARED_LIBADD) PHP_EXTENSION(fdf, $ext_shared) fi Index: php4/ext/fribidi/config.m4 diff -u php4/ext/fribidi/config.m4:1.3 php4/ext/fribidi/config.m4:1.4 --- php4/ext/fribidi/config.m4:1.3 Fri Feb 23 08:49:58 2001 +++ php4/ext/fribidi/config.m4 Tue Mar 27 12:34:26 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.3 2001/02/23 16:49:58 sas Exp $ +dnl $Id: config.m4,v 1.4 2001/03/27 20:34:26 sniper Exp $ dnl config.m4 for extension fribidi dnl don't forget to call PHP_EXTENSION(fribidi) @@ -61,9 +61,9 @@ AC_MSG_RESULT([yes]) - AC_ADD_INCLUDE("$FRIBIDI_INCDIR") - AC_ADD_INCLUDE("$GLIB_INCDIR") - AC_ADD_LIBRARY_WITH_PATH(fribidi,"$FRIBIDI_LIBDIR", FRIBIDI_SHARED_LIBADD) + PHP_ADD_INCLUDE("$FRIBIDI_INCDIR") + PHP_ADD_INCLUDE("$GLIB_INCDIR") + PHP_ADD_LIBRARY_WITH_PATH(fribidi,"$FRIBIDI_LIBDIR", FRIBIDI_SHARED_LIBADD) PHP_SUBST(FRIBIDI_SHARED_LIBADD) AC_DEFINE(HAVE_FRIBIDI, 1, [ ]) Index: php4/ext/gd/config.m4 diff -u php4/ext/gd/config.m4:1.53 php4/ext/gd/config.m4:1.54 --- php4/ext/gd/config.m4:1.53 Sat Jan 6 00:38:07 2001 +++ php4/ext/gd/config.m4 Tue Mar 27 12:34:26 2001 @@ -14,7 +14,7 @@ GD_LIBS="$GD_LIBS -ljpeg" GD_LFLAGS="$GD_LFLAGS -L$withval/lib" else - AC_ADD_LIBRARY_WITH_PATH(jpeg, $withval/lib) + PHP_ADD_LIBRARY_WITH_PATH(jpeg, $withval/lib) fi LIBS="$LIBS -L$withval/lib -ljpeg" ],[ @@ -36,8 +36,8 @@ LIBS="$LIBS -L$withval/lib -lX11" AC_CHECK_LIB(Xpm,XpmFreeXpmImage, [LIBS="$LIBS -L$withval/lib -lXpm"],[AC_MSG_RESULT(no)],) LIBS=$old_LIBS - AC_ADD_LIBRARY_WITH_PATH(Xpm, $withval/lib) - AC_ADD_LIBRARY_WITH_PATH(X11, $withval/lib) + PHP_ADD_LIBRARY_WITH_PATH(Xpm, $withval/lib) + PHP_ADD_LIBRARY_WITH_PATH(X11, $withval/lib) LIBS="$LIBS -L$withval/lib -lXpm -L$withval/lib -lX11" ],[ AC_MSG_RESULT(no) @@ -47,11 +47,11 @@ AC_DEFUN(PHP_GD_CHECK_VERSION,[ + AC_CHECK_LIB(z, compress, LIBS="-lz $LIBS",,) + AC_CHECK_LIB(png,png_info_init, LIBS="-lpng $LIBS",,) AC_CHECK_LIB(gd, gdImageString16, [AC_DEFINE(HAVE_LIBGD13,1,[ ]) ]) AC_CHECK_LIB(gd, gdImagePaletteCopy, [AC_DEFINE(HAVE_LIBGD15,1,[ ]) ]) AC_CHECK_LIB(gd, gdImageColorClosestHWB, [AC_DEFINE(HAVE_COLORCLOSESTHWB,1,[ ]) ]) - AC_CHECK_LIB(z, compress, LIBS="-lz $LIBS",,) - AC_CHECK_LIB(png,png_info_init, LIBS="-lpng $LIBS",,) AC_CHECK_LIB(gd, gdImageColorResolve, [AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE,1,[ ])]) AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG, 1, [ ])]) AC_CHECK_LIB(gd, gdImageCreateFromGif, [AC_DEFINE(HAVE_GD_GIF, 1, [ ])]) @@ -100,7 +100,7 @@ GD_LIBS="-lgd $GD_LIBS" else AC_MSG_RESULT(yes (static)) - AC_ADD_LIBRARY(gd) + PHP_ADD_LIBRARY(gd) fi old_LDFLAGS=$LDFLAGS @@ -112,8 +112,8 @@ LIBS=$old_LIBS LDFLAGS=$old_LDFLAGS if test "$ac_cv_lib_gd_gdImageCreateFromPng" = "yes"; then - AC_ADD_LIBRARY(png) - AC_ADD_LIBRARY(z) + PHP_ADD_LIBRARY(png) + PHP_ADD_LIBRARY(z) if test "$shared" = "yes"; then GD_LIBS="$GD_LIBS -lpng -lz" fi @@ -153,7 +153,7 @@ GD_LFLAGS="-L$GD_LIB $GD_LFLAGS" else AC_MSG_RESULT(yes (static)) - AC_ADD_LIBRARY_WITH_PATH(gd, $GD_LIB) + PHP_ADD_LIBRARY_WITH_PATH(gd, $GD_LIB) fi old_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -L$GD_LIB" @@ -165,8 +165,8 @@ LIBS=$old_LIBS LDFLAGS=$old_LDFLAGS if test "$ac_cv_lib_gd_gdImageCreateFromPng" = "yes"; then - AC_ADD_LIBRARY(z) - AC_ADD_LIBRARY(png) + PHP_ADD_LIBRARY(z) + PHP_ADD_LIBRARY(png) if test "$shared" = "yes"; then GD_LIBS="$GD_LIBS -lpng -lz" fi @@ -210,12 +210,12 @@ GD_LIBS="$GD_LIBS -lttf" GD_LFLAGS="$GD_LFLAGS -L$TTF_DIR/lib" else - AC_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib) + PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib) fi if test -z "$TTF_INC_DIR"; then TTF_INC_DIR="$TTF_DIR/include" fi - AC_ADD_INCLUDE($TTF_INC_DIR) + PHP_ADD_INCLUDE($TTF_INC_DIR) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) @@ -242,12 +242,12 @@ fi if test "$T1_DIR" != "no"; then - AC_ADD_INCLUDE("$T1_DIR/include") + PHP_ADD_INCLUDE("$T1_DIR/include") if test "$shared" = "yes"; then GD_LIBS="$GD_LIBS -lt1" GD_LFLAGS="$GD_LFLAGS -L$T1_DIR/lib" else - AC_ADD_LIBRARY_WITH_PATH(t1, "$T1_DIR/lib") + PHP_ADD_LIBRARY_WITH_PATH(t1, "$T1_DIR/lib") fi LIBS="$LIBS -L$T1_DIR/lib -lt1" fi @@ -271,8 +271,8 @@ GD_INCLUDE="/usr/include/gd" fi - AC_EXPAND_PATH($GD_INCLUDE, GD_INCLUDE) - AC_ADD_INCLUDE($GD_INCLUDE) + PHP_EXPAND_PATH($GD_INCLUDE, GD_INCLUDE) + PHP_ADD_INCLUDE($GD_INCLUDE) PHP_EXTENSION(gd, $shared) if test "$shared" != "yes"; then GD_STATIC="libphpext_gd.la" Index: php4/ext/gettext/config.m4 diff -u php4/ext/gettext/config.m4:1.5 php4/ext/gettext/config.m4:1.6 --- php4/ext/gettext/config.m4:1.5 Tue May 23 15:26:51 2000 +++ php4/ext/gettext/config.m4 Tue Mar 27 12:34:27 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.5 2000/05/23 22:26:51 sas Exp $ +dnl $Id: config.m4,v 1.6 2001/03/27 20:34:27 sniper Exp $ dnl config.m4 for extension gettext dnl don't forget to call PHP_EXTENSION(gettext) @@ -34,8 +34,8 @@ PHP_SUBST(GETTEXT_SHARED_LIBADD) if test -n "$GETTEXT_LIBS"; then - AC_ADD_LIBRARY_WITH_PATH($GETTEXT_LIBS, $GETTEXT_LIBDIR, GETTEXT_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH($GETTEXT_LIBS, $GETTEXT_LIBDIR, GETTEXT_SHARED_LIBADD) fi - AC_ADD_INCLUDE($GETTEXT_INCDIR) + PHP_ADD_INCLUDE($GETTEXT_INCDIR) fi Index: php4/ext/gmp/config.m4 diff -u php4/ext/gmp/config.m4:1.3 php4/ext/gmp/config.m4:1.4 --- php4/ext/gmp/config.m4:1.3 Wed Dec 6 09:34:55 2000 +++ php4/ext/gmp/config.m4 Tue Mar 27 12:34:27 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.3 2000/12/06 17:34:55 sas Exp $ +dnl $Id: config.m4,v 1.4 2001/03/27 20:34:27 sniper Exp $ dnl config.m4 for extension gmp dnl If your extension references something external, use with: @@ -18,10 +18,10 @@ if test -z "$GMP_DIR"; then AC_MSG_ERROR(Unable to locate gmp.h) fi - AC_ADD_INCLUDE($GMP_DIR/include) + PHP_ADD_INCLUDE($GMP_DIR/include) PHP_EXTENSION(gmp, $ext_shared) AC_DEFINE(HAVE_GMP, 1, [ ]) - AC_ADD_LIBRARY_WITH_PATH(gmp, $GMP_DIR/lib) + PHP_ADD_LIBRARY_WITH_PATH(gmp, $GMP_DIR/lib) fi Index: php4/ext/icap/config.m4 diff -u php4/ext/icap/config.m4:1.8 php4/ext/icap/config.m4:1.9 --- php4/ext/icap/config.m4:1.8 Mon May 1 21:01:14 2000 +++ php4/ext/icap/config.m4 Tue Mar 27 12:34:27 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.8 2000/05/02 04:01:14 sas Exp $ +dnl $Id: config.m4,v 1.9 2001/03/27 20:34:27 sniper Exp $ PHP_ARG_WITH(icap,for ICAP support, [ --with-icap[=DIR] Include ICAP support.]) @@ -7,9 +7,9 @@ ICAP_DIR=$PHP_ICAP test "$ICAP_DIR" = "yes" && ICAP_DIR=/usr/local - AC_ADD_INCLUDE($ICAP_DIR) + PHP_ADD_INCLUDE($ICAP_DIR) PHP_SUBST(ICAP_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(icap, $ICAP_DIR, ICAP_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(icap, $ICAP_DIR, ICAP_SHARED_LIBADD) AC_DEFINE(HAVE_ICAP,1,[ ]) PHP_EXTENSION(icap, $ext_shared) fi Index: php4/ext/iconv/config.m4 diff -u php4/ext/iconv/config.m4:1.1 php4/ext/iconv/config.m4:1.2 --- php4/ext/iconv/config.m4:1.1 Tue Jan 9 07:22:45 2001 +++ php4/ext/iconv/config.m4 Tue Mar 27 12:34:28 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.1 2001/01/09 15:22:45 hirokawa Exp $ +dnl $Id: config.m4,v 1.2 2001/03/27 20:34:28 sniper Exp $ dnl config.m4 for extension iconv PHP_ARG_WITH(iconv, for iconv support, @@ -23,13 +23,13 @@ AC_MSG_ERROR(Please reinstall the iconv library) fi - AC_ADD_INCLUDE($ICONV_DIR/include) + PHP_ADD_INCLUDE($ICONV_DIR/include) PHP_SUBST(ICONV_SHARED_LIBADD) if test -f $ICONV_DIR/lib/libconv.a -o -f $ICONV_DIR/lib/libiconv.so ; then AC_CHECK_LIB(iconv, iconv_open, AC_DEFINE(HAVE_ICONV, 1, [ ])) - AC_ADD_LIBRARY_WITH_PATH(iconv, $ICONV_DIR/lib, ICONV_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(iconv, $ICONV_DIR/lib, ICONV_SHARED_LIBADD) else AC_CHECK_LIB(c, iconv_open, AC_DEFINE(HAVE_ICONV, 1, [ ])) fi Index: php4/ext/imap/config.m4 diff -u php4/ext/imap/config.m4:1.25 php4/ext/imap/config.m4:1.26 --- php4/ext/imap/config.m4:1.25 Wed Feb 28 23:06:54 2001 +++ php4/ext/imap/config.m4 Tue Mar 27 12:34:28 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.25 2001/03/01 07:06:54 chagenbu Exp $ +dnl $Id: config.m4,v 1.26 2001/03/27 20:34:28 sniper Exp $ AC_DEFUN(IMAP_INC_CHK,[if test -r "$i$1/c-client.h"; then AC_DEFINE(HAVE_IMAP2000, 1, [ ]) @@ -57,7 +57,7 @@ fi done - AC_EXPAND_PATH($IMAP_DIR, IMAP_DIR) + PHP_EXPAND_PATH($IMAP_DIR, IMAP_DIR) if test -z "$IMAP_DIR"; then AC_MSG_ERROR(Cannot find rfc822.h. Please check your IMAP installation) @@ -79,28 +79,28 @@ AC_MSG_ERROR(Cannot find imap library. Please check your IMAP installation) fi - AC_ADD_INCLUDE($IMAP_INC_DIR) + PHP_ADD_INCLUDE($IMAP_INC_DIR) if test "$ext_shared" = "yes"; then - AC_ADD_LIBRARY_WITH_PATH($IMAP_LIB, $IMAP_LIBDIR, IMAP_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH($IMAP_LIB, $IMAP_LIBDIR, IMAP_SHARED_LIBADD) PHP_SUBST(IMAP_SHARED_LIBADD) else - AC_ADD_LIBPATH($IMAP_LIBDIR) - AC_ADD_LIBRARY_DEFER($IMAP_LIB) + PHP_ADD_LIBPATH($IMAP_LIBDIR) + PHP_ADD_LIBRARY_DEFER($IMAP_LIB) fi if test "$PHP_KERBEROS" != "no"; then - AC_ADD_LIBPATH($PHP_KERBEROS_LIBDIR, IMAP_SHARED_LIBADD) - AC_ADD_LIBRARY(com_err,, IMAP_SHARED_LIBADD) - AC_ADD_LIBRARY(k5crypto,, IMAP_SHARED_LIBADD) - AC_ADD_LIBRARY(krb5,, IMAP_SHARED_LIBADD) - AC_ADD_LIBRARY(gssapi_krb5,, IMAP_SHARED_LIBADD) + PHP_ADD_LIBPATH($PHP_KERBEROS_LIBDIR, IMAP_SHARED_LIBADD) + PHP_ADD_LIBRARY(com_err,, IMAP_SHARED_LIBADD) + PHP_ADD_LIBRARY(k5crypto,, IMAP_SHARED_LIBADD) + PHP_ADD_LIBRARY(krb5,, IMAP_SHARED_LIBADD) + PHP_ADD_LIBRARY(gssapi_krb5,, IMAP_SHARED_LIBADD) fi if test "$PHP_IMAP_SSL" != "no"; then AC_DEFINE(HAVE_IMAP_SSL,1,[ ]) - AC_ADD_LIBPATH($PHP_SSL_LIBDIR, IMAP_SHARED_LIBADD) - AC_ADD_LIBRARY(ssl,, IMAP_SHARED_LIBADD) - AC_ADD_LIBRARY(crypto,, IMAP_SHARED_LIBADD) + PHP_ADD_LIBPATH($PHP_SSL_LIBDIR, IMAP_SHARED_LIBADD) + PHP_ADD_LIBRARY(ssl,, IMAP_SHARED_LIBADD) + PHP_ADD_LIBRARY(crypto,, IMAP_SHARED_LIBADD) fi PHP_EXTENSION(imap, $ext_shared) Index: php4/ext/informix/config.m4 diff -u php4/ext/informix/config.m4:1.16 php4/ext/informix/config.m4:1.17 --- php4/ext/informix/config.m4:1.16 Tue May 23 16:13:33 2000 +++ php4/ext/informix/config.m4 Tue Mar 27 12:34:29 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.16 2000/05/23 23:13:33 sas Exp $ +dnl $Id: config.m4,v 1.17 2001/03/27 20:34:29 sniper Exp $ PHPIFXLIB=ext/informix/libphp_ifx.a @@ -17,16 +17,16 @@ if test "$PHP_INFORMIX" = "yes"; then IFX_INCDIR=$INFORMIXDIR/incl/esql if test -z "$IFX_LIBDIR"; then - AC_ADD_LIBPATH($INFORMIXDIR/lib, INFORMIX_SHARED_LIBADD) - AC_ADD_LIBPATH($INFORMIXDIR/lib/esql, INFORMIX_SHARED_LIBADD) + PHP_ADD_LIBPATH($INFORMIXDIR/lib, INFORMIX_SHARED_LIBADD) + PHP_ADD_LIBPATH($INFORMIXDIR/lib/esql, INFORMIX_SHARED_LIBADD) else IFX_LIBDIR="$IFX_LIBDIR" fi else IFX_INCDIR=$PHP_INFORMIX/incl/esql if test -z "$IFX_LIBDIR"; then - AC_ADD_LIBPATH($PHP_INFORMIX/lib, INFORMIX_SHARED_LIBADD) - AC_ADD_LIBPATH($PHP_INFORMIX/lib/esql, INFORMIX_SHARED_LIBADD) + PHP_ADD_LIBPATH($PHP_INFORMIX/lib, INFORMIX_SHARED_LIBADD) + PHP_ADD_LIBPATH($PHP_INFORMIX/lib/esql, INFORMIX_SHARED_LIBADD) else IFX_LIBDIR="$IFX_LIBDIR" fi @@ -73,8 +73,8 @@ for i in $IFX_LIBS; do case "$i" in *.o) - AC_ADD_LIBPATH($abs_builddir/ext/informix, INFORMIX_SHARED_LIBADD) - AC_ADD_LIBRARY(php_ifx, 1, INFORMIX_SHARED_LIBADD) + PHP_ADD_LIBPATH($abs_builddir/ext/informix, INFORMIX_SHARED_LIBADD) + PHP_ADD_LIBRARY(php_ifx, 1, INFORMIX_SHARED_LIBADD) $srcdir/build/shtool mkdir -p ext/informix cd ext/informix ar r libphp_ifx.a $i @@ -82,7 +82,7 @@ cd ../..;; -l*) lib=`echo $i|sed 's/^-l//'` - AC_ADD_LIBRARY($lib, 1, INFORMIX_SHARED_LIBADD);; + PHP_ADD_LIBRARY($lib, 1, INFORMIX_SHARED_LIBADD);; *) IFX_LIBADD="$IFX_LIBADD $i";; esac Index: php4/ext/ingres_ii/config.m4 diff -u php4/ext/ingres_ii/config.m4:1.4 php4/ext/ingres_ii/config.m4:1.5 --- php4/ext/ingres_ii/config.m4:1.4 Thu Aug 31 08:10:15 2000 +++ php4/ext/ingres_ii/config.m4 Tue Mar 27 12:34:29 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.4 2000/08/31 15:10:15 henot Exp $ +dnl $Id: config.m4,v 1.5 2001/03/27 20:34:29 sniper Exp $ dnl config.m4 for extension ingres_ii PHP_ARG_WITH(ingres, for Ingres II support, @@ -28,9 +28,9 @@ AC_MSG_ERROR(Cannot find libiiapi.a under $II_DIR/lib) fi - AC_ADD_LIBRARY_WITH_PATH(iiapi, $II_LIB_DIR, II_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(ingres, $II_LIB_DIR, II_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(iiapi, $II_LIB_DIR, II_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(ingres, $II_LIB_DIR, II_SHARED_LIBADD) - AC_ADD_INCLUDE($II_INC_DIR) + PHP_ADD_INCLUDE($II_INC_DIR) fi PHP_SUBST(II_SHARED_LIBADD) Index: php4/ext/interbase/config.m4 diff -u php4/ext/interbase/config.m4:1.5 php4/ext/interbase/config.m4:1.6 --- php4/ext/interbase/config.m4:1.5 Thu May 11 20:02:14 2000 +++ php4/ext/interbase/config.m4 Tue Mar 27 12:34:29 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.5 2000/05/12 03:02:14 jah Exp $ +dnl $Id: config.m4,v 1.6 2001/03/27 20:34:29 sniper Exp $ PHP_ARG_WITH(interbase,for InterBase support, [ --with-interbase[=DIR] Include InterBase support. DIR is the InterBase base @@ -12,8 +12,8 @@ IBASE_INCDIR=$PHP_INTERBASE/include IBASE_LIBDIR=$PHP_INTERBASE/lib fi - AC_ADD_LIBRARY_WITH_PATH(gds, $IBASE_LIBDIR, INTERBASE_SHARED_LIBADD) - AC_ADD_INCLUDE($IBASE_INCDIR) + PHP_ADD_LIBRARY_WITH_PATH(gds, $IBASE_LIBDIR, INTERBASE_SHARED_LIBADD) + PHP_ADD_INCLUDE($IBASE_INCDIR) AC_DEFINE(HAVE_IBASE,1,[ ]) dnl AC_CHECK_LIB(c, strptime, [AC_DEFINE(HAVE_STRPTIME,1,[])]) PHP_EXTENSION(interbase, $ext_shared) Index: php4/ext/ircg/config.m4 diff -u php4/ext/ircg/config.m4:1.5 php4/ext/ircg/config.m4:1.6 --- php4/ext/ircg/config.m4:1.5 Thu Mar 8 15:13:34 2001 +++ php4/ext/ircg/config.m4 Tue Mar 27 12:34:30 2001 @@ -14,8 +14,8 @@ PHP_EVAL_LIBLINE(`$IRCG_CONFIG --ldflags`) PHP_EVAL_INCLINE(`$IRCG_CONFIG --cppflags`) - AC_ADD_LIBRARY_WITH_PATH(ircg, $PHP_IRCG/lib) - AC_ADD_INCLUDE($PHP_IRCG/include) + PHP_ADD_LIBRARY_WITH_PATH(ircg, $PHP_IRCG/lib) + PHP_ADD_INCLUDE($PHP_IRCG/include) AC_DEFINE(HAVE_IRCG, 1, [Whether you want IRCG support]) PHP_EXTENSION(ircg, $ext_shared) fi Index: php4/ext/java/config.m4 diff -u php4/ext/java/config.m4:1.22 php4/ext/java/config.m4:1.23 --- php4/ext/java/config.m4:1.22 Thu Jan 18 10:36:22 2001 +++ php4/ext/java/config.m4 Tue Mar 27 12:34:30 2001 @@ -1,4 +1,4 @@ -# $Id: config.m4,v 1.22 2001/01/18 18:36:22 akilov Exp $ +# $Id: config.m4,v 1.23 2001/03/27 20:34:30 sniper Exp $ # config.m4 for extension java AC_MSG_CHECKING(for Java support) @@ -28,8 +28,8 @@ fi if test -d $withval/lib/kaffe; then - AC_ADD_LIBPATH($withval/lib) - AC_ADD_LIBPATH($withval/lib/kaffe) + PHP_ADD_LIBPATH($withval/lib) + PHP_ADD_LIBPATH($withval/lib/kaffe) JAVA_CFLAGS="-DKAFFE" JAVA_INCLUDE=-I$withval/include/kaffe @@ -73,10 +73,10 @@ if test -f $i/$java_libext; then JAVA_LIB=java JAVA_LIBPATH=$i - test -d $i/hotspot && AC_ADD_LIBPATH($i/hotspot) - test -d $i/classic && AC_ADD_LIBPATH($i/classic) - test -d $i/server && AC_ADD_LIBPATH($i/server) - test -d $i/native_threads && AC_ADD_LIBPATH($i/native_threads) + test -d $i/hotspot && PHP_ADD_LIBPATH($i/hotspot) + test -d $i/classic && PHP_ADD_LIBPATH($i/classic) + test -d $i/server && PHP_ADD_LIBPATH($i/server) + test -d $i/native_threads && PHP_ADD_LIBPATH($i/native_threads) fi done @@ -89,14 +89,14 @@ fi AC_DEFINE(HAVE_JAVA,1,[ ]) - AC_ADD_LIBPATH($JAVA_LIBPATH) + PHP_ADD_LIBPATH($JAVA_LIBPATH) JAVA_CFLAGS="$JAVA_CFLAGS '-DJAVALIB=\"$JAVA_LIBPATH/$java_libext\"'" if test "$PHP_SAPI" != "servlet"; then PHP_EXTENSION(java, shared) if test "$PHP_SAPI" = "cgi"; then - AC_ADD_LIBRARY($JAVA_LIB) + PHP_ADD_LIBRARY($JAVA_LIB) fi INSTALL_IT="$INSTALL_IT; \$(srcdir)/build/shtool mkdir -p -f -m 0755 \$(libdir)" Index: php4/ext/ldap/config.m4 diff -u php4/ext/ldap/config.m4:1.15 php4/ext/ldap/config.m4:1.16 --- php4/ext/ldap/config.m4:1.15 Mon Mar 26 02:30:48 2001 +++ php4/ext/ldap/config.m4 Tue Mar 27 12:34:30 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.15 2001/03/26 10:30:48 sniper Exp $ +dnl $Id: config.m4,v 1.16 2001/03/27 20:34:30 sniper Exp $ AC_DEFUN(PHP_LDAP_CHECKS, [ if test -f $1/include/ldap.h; then @@ -47,43 +47,43 @@ fi if test -f $LDAP_LIBDIR/liblber.a -o -f $LDAP_LIBDIR/liblber.so -o -f $LDAP_LIBDIR/liblber.sl; then - AC_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) elif test -f $LDAP_LIBDIR/libldap.so.3; then - AC_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) elif test -f $LDAP_LIBDIR/libldapssl41.so -o -f $LDAP_LIBDIR/libldapssl41.sl; then if test -n "$LDAP_PTHREAD"; then - AC_ADD_LIBRARY($LDAP_PTHREAD) + PHP_ADD_LIBRARY($LDAP_PTHREAD) fi - AC_ADD_LIBRARY_WITH_PATH(ldapssl41, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(ldapssl41, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) AC_DEFINE(HAVE_NSLDAP,1,[ ]) elif test -f $LDAP_LIBDIR/libldapssl30.so -o -f $LDAP_LIBDIR/libldapssl30.sl; then if test -n "$LDAP_PTHREAD"; then - AC_ADD_LIBRARY($LDAP_PTHREAD) + PHP_ADD_LIBRARY($LDAP_PTHREAD) fi - AC_ADD_LIBRARY_WITH_PATH(ldapssl30, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(ldapssl30, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) AC_DEFINE(HAVE_NSLDAP,1,[ ]) elif test -f $LDAP_LIBDIR/libldap30.so -o -f $LDAP_LIBDIR/libldap30.sl; then if test -n "$LDAP_PTHREAD"; then - AC_ADD_LIBRARY($LDAP_PTHREAD) + PHP_ADD_LIBRARY($LDAP_PTHREAD) fi - AC_ADD_LIBRARY_WITH_PATH(ldap30, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(ldap30, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) AC_DEFINE(HAVE_NSLDAP,1,[ ]) elif test -f $LDAP_LIBDIR/libumich_ldap.so; then - AC_ADD_LIBRARY_WITH_PATH(umich_lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(umich_ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(umich_lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(umich_ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) elif test -f $LDAP_LIBDIR/libclntsh.so; then - AC_ADD_LIBRARY_WITH_PATH(clntsh, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(clntsh, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) AC_DEFINE(HAVE_ORALDAP,1,[ ]) fi - AC_ADD_INCLUDE($LDAP_INCDIR) + PHP_ADD_INCLUDE($LDAP_INCDIR) PHP_SUBST(LDAP_SHARED_LIBADD) AC_DEFINE(HAVE_LDAP,1,[ ]) fi Index: php4/ext/mcal/config.m4 diff -u php4/ext/mcal/config.m4:1.9 php4/ext/mcal/config.m4:1.10 --- php4/ext/mcal/config.m4:1.9 Tue Dec 5 04:15:17 2000 +++ php4/ext/mcal/config.m4 Tue Mar 27 12:34:31 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.9 2000/12/05 12:15:17 ssb Exp $ +dnl $Id: config.m4,v 1.10 2001/03/27 20:34:31 sniper Exp $ PHP_ARG_WITH(mcal,for MCAL support, [ --with-mcal[=DIR] Include MCAL support.]) @@ -8,7 +8,7 @@ if test "$PHP_MCAL" = "yes"; then MCAL_DIR=$MCAL_DEFAULT_SEARCH else - AC_EXPAND_PATH($PHP_MCAL, MCAL_DIR) + PHP_EXPAND_PATH($PHP_MCAL, MCAL_DIR) fi for i in $MCAL_DIR $MCAL_DIR/mcal $MCAL_DIR/mcal/include $MCAL_DIR/include/mcal $MCAL_DIR/include; do @@ -39,8 +39,8 @@ AC_MSG_ERROR(Unable to locate your libmcal library files - libmcal.a should be in the directory you specify or in the lib/ subdirectory below it - default search location is $MCAL_DEFAULT_SEARCH) fi - AC_ADD_INCLUDE($MCAL_INCLUDE) - AC_ADD_LIBRARY_WITH_PATH(mcal, $MCAL_LIBRARY, MCAL_SHARED_LIBADD) + PHP_ADD_INCLUDE($MCAL_INCLUDE) + PHP_ADD_LIBRARY_WITH_PATH(mcal, $MCAL_LIBRARY, MCAL_SHARED_LIBADD) PHP_SUBST(MCAL_SHARED_LIBADD) AC_DEFINE(HAVE_MCAL,1,[ ]) PHP_EXTENSION(mcal,$ext_shared) Index: php4/ext/mcrypt/config.m4 diff -u php4/ext/mcrypt/config.m4:1.15 php4/ext/mcrypt/config.m4:1.16 --- php4/ext/mcrypt/config.m4:1.15 Fri Dec 15 07:35:48 2000 +++ php4/ext/mcrypt/config.m4 Tue Mar 27 12:34:31 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.15 2000/12/15 15:35:48 derick Exp $ +dnl $Id: config.m4,v 1.16 2001/03/27 20:34:31 sniper Exp $ dnl config.m4 for extension mcrypt dnl don't forget to call PHP_EXTENSION(mcrypt) @@ -17,7 +17,7 @@ AC_MSG_ERROR(Please reinstall libmcrypt - I cannot find mcrypt.h) fi - AC_ADD_INCLUDE($MCRYPT_DIR/include) + PHP_ADD_INCLUDE($MCRYPT_DIR/include) PHP_SUBST(MCRYPT_SHARED_LIBADD) old_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $ld_runpath_switch$MCRYPT_DIR/lib -L$MCRYPT_DIR/lib" @@ -28,14 +28,14 @@ LIBS=$old_LIBS LDFLAGS="$old_LDFLAGS" if test "$ac_cv_lib_mcrypt_mcrypt_module_open" = "yes"; then - AC_ADD_LIBRARY(ltdl) + PHP_ADD_LIBRARY(ltdl) AC_DEFINE(HAVE_LIBMCRYPT24,1,[ ]) elif test "$ac_cv_lib_mcrypt_init_mcrypt" = "yes"; then AC_DEFINE(HAVE_LIBMCRYPT22,1,[ ]) else AC_MSG_ERROR(Sorry, I was not able to diagnose which libmcrypt version you have installed.) fi - AC_ADD_LIBRARY_WITH_PATH(mcrypt, $MCRYPT_DIR/lib, MCRYPT_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(mcrypt, $MCRYPT_DIR/lib, MCRYPT_SHARED_LIBADD) AC_DEFINE(HAVE_LIBMCRYPT,1,[ ]) PHP_EXTENSION(mcrypt, $ext_shared) Index: php4/ext/mhash/config.m4 diff -u php4/ext/mhash/config.m4:1.9 php4/ext/mhash/config.m4:1.10 --- php4/ext/mhash/config.m4:1.9 Mon May 1 21:01:14 2000 +++ php4/ext/mhash/config.m4 Tue Mar 27 12:34:31 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.9 2000/05/02 04:01:14 sas Exp $ +dnl $Id: config.m4,v 1.10 2001/03/27 20:34:31 sniper Exp $ dnl config.m4 for extension mhash dnl don't forget to call PHP_EXTENSION(mhash) @@ -16,8 +16,8 @@ if test -z "$MHASH_DIR"; then AC_MSG_ERROR(Please reinstall libmhash - I cannot find mhash.h) fi - AC_ADD_INCLUDE($MHASH_DIR/include) - AC_ADD_LIBRARY_WITH_PATH(mhash, $MHASH_DIR/lib, MHASH_SHARED_LIBADD) + PHP_ADD_INCLUDE($MHASH_DIR/include) + PHP_ADD_LIBRARY_WITH_PATH(mhash, $MHASH_DIR/lib, MHASH_SHARED_LIBADD) PHP_SUBST(MHASH_SHARED_LIBADD) AC_DEFINE(HAVE_LIBMHASH,1,[ ]) Index: php4/ext/midgard/config.m4 diff -u php4/ext/midgard/config.m4:1.20 php4/ext/midgard/config.m4:1.21 --- php4/ext/midgard/config.m4:1.20 Mon Mar 19 15:37:03 2001 +++ php4/ext/midgard/config.m4 Tue Mar 27 12:34:32 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.20 2001/03/19 23:37:03 davidg Exp $ +dnl $Id: config.m4,v 1.21 2001/03/27 20:34:32 sniper Exp $ dnl Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]> dnl Copyright (C) 2000 The Midgard Project ry @@ -27,10 +27,10 @@ if test "$PHP_MIDGARD" != "no"; then if test "$PHP_MIDGARD" != "yes"; then - AC_ADD_LIBRARY_WITH_PATH(midgard, "$PHP_MIDGARD/lib", MIDGARD_SHARED_LIBADD) - AC_ADD_INCLUDE("$PHP_MIDGARD/include") + PHP_ADD_LIBRARY_WITH_PATH(midgard, "$PHP_MIDGARD/lib", MIDGARD_SHARED_LIBADD) + PHP_ADD_INCLUDE("$PHP_MIDGARD/include") else - AC_ADD_LIBRARY(midgard) + PHP_ADD_LIBRARY(midgard) fi dnl EEH/TODO: Add checks for apache-static compilation @@ -39,7 +39,7 @@ AC_MSG_ERROR(apxs not found.) fi APACHE_INCLUDES=`$APXS -q INCLUDEDIR` - AC_ADD_INCLUDE($APACHE_INCLUDES) + PHP_ADD_INCLUDE($APACHE_INCLUDES) AC_PATH_PROG(GLIBCONFIG, glib-config) dnl Ackackack... why do people do this? Index: php4/ext/midgard/config.m4.session diff -u php4/ext/midgard/config.m4.session:1.8 php4/ext/midgard/config.m4.session:1.9 --- php4/ext/midgard/config.m4.session:1.8 Mon Mar 19 04:52:00 2001 +++ php4/ext/midgard/config.m4.session Tue Mar 27 12:34:32 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4.session,v 1.8 2001/03/19 12:52:00 ab Exp $ +dnl $Id: config.m4.session,v 1.9 2001/03/27 20:34:32 sniper Exp $ dnl Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]> dnl Copyright (C) 2000 The Midgard Project ry @@ -27,10 +27,10 @@ if test "$PHP_MIDGARD" != "no"; then if test "$PHP_MIDGARD" != "yes"; then - AC_ADD_LIBRARY_WITH_PATH(midgard, "$PHP_MIDGARD/lib", MIDGARD_SHARED_LIBADD) - AC_ADD_INCLUDE("$PHP_MIDGARD/include") + PHP_ADD_LIBRARY_WITH_PATH(midgard, "$PHP_MIDGARD/lib", MIDGARD_SHARED_LIBADD) + PHP_ADD_INCLUDE("$PHP_MIDGARD/include") else - AC_ADD_LIBRARY(midgard) + PHP_ADD_LIBRARY(midgard) fi dnl EEH/TODO: Add checks for apache-static compilation @@ -39,7 +39,7 @@ AC_MSG_ERROR(apxs not found.) fi APACHE_INCLUDES=`$APXS -q INCLUDEDIR` - AC_ADD_INCLUDE($APACHE_INCLUDES) + PHP_ADD_INCLUDE($APACHE_INCLUDES) AC_PATH_PROG(GLIBCONFIG, glib-config) dnl Ackackack... why do people do this? Index: php4/ext/ming/config.m4 diff -u php4/ext/ming/config.m4:1.4 php4/ext/ming/config.m4:1.5 --- php4/ext/ming/config.m4:1.4 Thu Mar 15 18:06:33 2001 +++ php4/ext/ming/config.m4 Tue Mar 27 12:34:32 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.4 2001/03/16 02:06:33 sniper Exp $ +dnl $Id: config.m4,v 1.5 2001/03/27 20:34:32 sniper Exp $ dnl config.m4 for extension libming PHP_ARG_WITH(ming, whether to include ming support, @@ -15,10 +15,10 @@ AC_MSG_ERROR(Please reinstall libming.so - I cannot find libming.so) fi - AC_ADD_INCLUDE($MING_DIR/include) + PHP_ADD_INCLUDE($MING_DIR/include) PHP_SUBST(MING_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib, MING_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib, MING_SHARED_LIBADD) AC_CHECK_LIB(ming, Ming_setScale, [ AC_DEFINE(HAVE_MING,1,[ ]) Index: php4/ext/mnogosearch/config.m4 diff -u php4/ext/mnogosearch/config.m4:1.6 php4/ext/mnogosearch/config.m4:1.7 --- php4/ext/mnogosearch/config.m4:1.6 Wed Feb 14 12:10:14 2001 +++ php4/ext/mnogosearch/config.m4 Tue Mar 27 12:34:33 2001 @@ -1,5 +1,5 @@ dnl $Source: /local/repository/php4/ext/mnogosearch/config.m4,v $ -dnl $Id: config.m4,v 1.6 2001/02/14 20:10:14 jon Exp $ +dnl $Id: config.m4,v 1.7 2001/03/27 20:34:33 sniper Exp $ PHP_ARG_WITH(mnogosearch,for mnoGoSearch support, [ --with-mnogosearch[=DIR] Include mnoGoSearch support. DIR is the mnoGoSearch base @@ -40,7 +40,7 @@ AC_MSG_ERROR(udm-config script not found in $MNOGOSEARCH_BINDIR) fi - AC_ADD_INCLUDE($MNOGOSEARCH_INCDIR) + PHP_ADD_INCLUDE($MNOGOSEARCH_INCDIR) AC_DEFINE(HAVE_MNOGOSEARCH,1,[ ]) Index: php4/ext/msql/config.m4 diff -u php4/ext/msql/config.m4:1.7 php4/ext/msql/config.m4:1.8 --- php4/ext/msql/config.m4:1.7 Tue May 23 16:24:04 2000 +++ php4/ext/msql/config.m4 Tue Mar 27 12:34:33 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.7 2000/05/23 23:24:04 sas Exp $ +dnl $Id: config.m4,v 1.8 2001/03/27 20:34:33 sniper Exp $ dnl dnl Test mSQL version by checking if msql.h has "IDX_TYPE" defined. @@ -31,8 +31,8 @@ MSQL_INCDIR=$PHP_MSQL/include MSQL_LIBDIR=$PHP_MSQL/lib fi - AC_ADD_LIBRARY_WITH_PATH(msql, $MSQL_LIBDIR, MSQL_SHARED_LIBADD) - AC_ADD_INCLUDE($MSQL_INCDIR) + PHP_ADD_LIBRARY_WITH_PATH(msql, $MSQL_LIBDIR, MSQL_SHARED_LIBADD) + PHP_ADD_INCLUDE($MSQL_INCDIR) AC_DEFINE(HAVE_MSQL,1,[ ]) PHP_SUBST(MSQL_SHARED_LIBADD) PHP_EXTENSION(msql,$ext_shared) Index: php4/ext/muscat/config.m4 diff -u php4/ext/muscat/config.m4:1.2 php4/ext/muscat/config.m4:1.3 --- php4/ext/muscat/config.m4:1.2 Sun Mar 11 16:46:15 2001 +++ php4/ext/muscat/config.m4 Tue Mar 27 12:34:33 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.2 2001/03/12 00:46:15 sniper Exp $ +dnl $Id: config.m4,v 1.3 2001/03/27 20:34:33 sniper Exp $ PHP_ARG_WITH(muscat, for Muscat support, [ --with-muscat[=DIR] Include muscat support.]) @@ -30,6 +30,6 @@ AC_DEFINE(HAVE_MUSCAT, 1, [ ]) PHP_SUBST(MUSCAT_SHARED_LIBADD) AC_DEFINE_UNQUOTED(PHP_MUSCAT_DIR, "$MUSCAT_DIR", [ ]) - AC_ADD_LIBRARY_WITH_PATH(hdmuscat3.6, $MUSCAT_LIBDIR, MUSCAT_SHARED_LIBADD) - AC_ADD_INCLUDE($MUSCAT_INCDIR) + PHP_ADD_LIBRARY_WITH_PATH(hdmuscat3.6, $MUSCAT_LIBDIR, MUSCAT_SHARED_LIBADD) + PHP_ADD_INCLUDE($MUSCAT_INCDIR) fi Index: php4/ext/mysql/config.m4 diff -u php4/ext/mysql/config.m4:1.28 php4/ext/mysql/config.m4:1.29 --- php4/ext/mysql/config.m4:1.28 Sat Mar 10 09:33:33 2001 +++ php4/ext/mysql/config.m4 Tue Mar 27 12:34:37 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.28 2001/03/10 17:33:33 sniper Exp $ +dnl $Id: config.m4,v 1.29 2001/03/27 20:34:37 sniper Exp $ sinclude(ext/mysql/libmysql/acinclude.m4) sinclude(ext/mysql/libmysql/mysql.m4) @@ -51,7 +51,7 @@ PHP_SUBST(MYSQL_LIBADD) PHP_SUBST(MYSQL_SUBDIRS) LIB_BUILD($ext_builddir/libmysql,$ext_shared,yes) - AC_ADD_INCLUDE($ext_srcdir/libmysql) + PHP_ADD_INCLUDE($ext_srcdir/libmysql) MYSQL_MODULE_TYPE="builtin" elif test "$PHP_MYSQL" != "no"; then for i in $PHP_MYSQL; do @@ -77,14 +77,14 @@ AC_MSG_ERROR(Cannot find mysqlclient library under $MYSQL_DIR) fi - AC_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_LIB_DIR, MYSQL_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_LIB_DIR, MYSQL_SHARED_LIBADD) dnl Check if mysql_config is found. If yes, use the LIBS provided by it.. if test -x "$MYSQL_DIR/bin/mysql_config"; then PHP_EVAL_LIBLINE($MYSQL_DIR/bin/mysql_config --libs) fi - AC_ADD_INCLUDE($MYSQL_INC_DIR) + PHP_ADD_INCLUDE($MYSQL_INC_DIR) else MYSQL_MODULE_TYPE="none" fi Index: php4/ext/oci8/config.m4 diff -u php4/ext/oci8/config.m4:1.25 php4/ext/oci8/config.m4:1.26 --- php4/ext/oci8/config.m4:1.25 Wed Feb 14 13:41:39 2001 +++ php4/ext/oci8/config.m4 Tue Mar 27 12:34:37 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.25 2001/02/14 21:41:39 sniper Exp $ +dnl $Id: config.m4,v 1.26 2001/03/27 20:34:37 sniper Exp $ AC_DEFUN(AC_OCI8_VERSION,[ AC_MSG_CHECKING([Oracle version]) @@ -43,16 +43,16 @@ fi if test -d "$OCI8_DIR/rdbms/public"; then - AC_ADD_INCLUDE($OCI8_DIR/rdbms/public) + PHP_ADD_INCLUDE($OCI8_DIR/rdbms/public) fi if test -d "$OCI8_DIR/rdbms/demo"; then - AC_ADD_INCLUDE($OCI8_DIR/rdbms/demo) + PHP_ADD_INCLUDE($OCI8_DIR/rdbms/demo) fi if test -d "$OCI8_DIR/network/public"; then - AC_ADD_INCLUDE($OCI8_DIR/network/public) + PHP_ADD_INCLUDE($OCI8_DIR/network/public) fi if test -d "$OCI8_DIR/plsql/public"; then - AC_ADD_INCLUDE($OCI8_DIR/plsql/public) + PHP_ADD_INCLUDE($OCI8_DIR/plsql/public) fi if test -f "$OCI8_DIR/lib/sysliblist"; then @@ -64,15 +64,15 @@ AC_OCI8_VERSION($OCI8_DIR) case $OCI8_VERSION in 8.0) - AC_ADD_LIBRARY_WITH_PATH(nlsrtl3, "", OCI8_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(core4, "", OCI8_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(psa, "", OCI8_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(clntsh, $OCI8_DIR/lib, OCI8_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, "", OCI8_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(core4, "", OCI8_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(psa, "", OCI8_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(clntsh, $OCI8_DIR/lib, OCI8_SHARED_LIBADD) ;; 8.1) - AC_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD) - AC_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD) + PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD) + PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD) ;; *) AC_MSG_ERROR(Unsupported Oracle version!) Index: php4/ext/odbc/config.m4 diff -u php4/ext/odbc/config.m4:1.36 php4/ext/odbc/config.m4:1.37 --- php4/ext/odbc/config.m4:1.36 Wed Feb 21 10:23:53 2001 +++ php4/ext/odbc/config.m4 Tue Mar 27 12:34:37 2001 @@ -87,16 +87,16 @@ withval=/usr/local fi if test "$withval" != "no"; then - AC_ADD_INCLUDE($withval/incl) - AC_ADD_LIBPATH($withval/lib) + PHP_ADD_INCLUDE($withval/incl) + PHP_ADD_LIBPATH($withval/lib) ODBC_OBJS="$withval/lib/odbclib.a" ODBC_LIB="$abs_builddir/ext/odbc/libodbc_adabas.a" $srcdir/build/shtool mkdir -f -p ext/odbc rm -f "$ODBC_LIB" cp "$ODBC_OBJS" "$ODBC_LIB" - AC_ADD_LIBRARY(sqlptc) - AC_ADD_LIBRARY(sqlrte) - AC_ADD_LIBRARY_WITH_PATH(odbc_adabas, $abs_builddir/ext/odbc) + PHP_ADD_LIBRARY(sqlptc) + PHP_ADD_LIBRARY(sqlrte) + PHP_ADD_LIBRARY_WITH_PATH(odbc_adabas, $abs_builddir/ext/odbc) ODBC_TYPE=adabas AC_DEFINE(HAVE_ADABAS,1,[ ]) AC_MSG_RESULT(yes) @@ -119,10 +119,10 @@ withval=/usr/local fi if test "$withval" != "no"; then - AC_ADD_INCLUDE($withval/incl) - AC_ADD_LIBPATH($withval/lib) - AC_ADD_LIBRARY(sqlod) - AC_ADD_LIBRARY(sqlrte) + PHP_ADD_INCLUDE($withval/incl) + PHP_ADD_LIBPATH($withval/lib) + PHP_ADD_LIBRARY(sqlod) + PHP_ADD_LIBRARY(sqlrte) ODBC_TYPE=sapdb AC_DEFINE(HAVE_SAPDB,1,[ ]) AC_MSG_RESULT(yes) @@ -306,8 +306,8 @@ withval=/usr/local fi if test "$withval" != "no"; then - AC_ADD_LIBRARY_WITH_PATH(iodbc, $withval/lib) - AC_ADD_INCLUDE($withval/include) + PHP_ADD_LIBRARY_WITH_PATH(iodbc, $withval/lib) + PHP_ADD_INCLUDE($withval/include) ODBC_TYPE=iodbc AC_DEFINE(HAVE_IODBC,1,[ ]) AC_MSG_RESULT(yes) @@ -453,8 +453,8 @@ ODBC_SHARED="odbc.la" else AC_MSG_RESULT(yes (static)) - AC_ADD_LIBRARY_WITH_PATH(dmapic, $ODBC_LIBDIR) - AC_ADD_INCLUDE($ODBC_INCDIR) + PHP_ADD_LIBRARY_WITH_PATH(dmapic, $ODBC_LIBDIR) + PHP_ADD_INCLUDE($ODBC_INCDIR) ODBC_STATIC="libphpext_odbc.la" fi Index: php4/ext/oracle/config.m4 diff -u php4/ext/oracle/config.m4:1.19 php4/ext/oracle/config.m4:1.20 --- php4/ext/oracle/config.m4:1.19 Wed Feb 14 13:41:39 2001 +++ php4/ext/oracle/config.m4 Tue Mar 27 12:34:38 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.19 2001/02/14 21:41:39 sniper Exp $ +dnl $Id: config.m4,v 1.20 2001/03/27 20:34:38 sniper Exp $ AC_DEFUN(AC_ORACLE_VERSION,[ AC_MSG_CHECKING([Oracle version]) @@ -43,16 +43,16 @@ fi if test -d "$ORACLE_DIR/rdbms/public"; then - AC_ADD_INCLUDE($ORACLE_DIR/rdbms/public) + PHP_ADD_INCLUDE($ORACLE_DIR/rdbms/public) fi if test -d "$ORACLE_DIR/rdbms/demo"; then - AC_ADD_INCLUDE($ORACLE_DIR/rdbms/demo) + PHP_ADD_INCLUDE($ORACLE_DIR/rdbms/demo) fi if test -d "$ORACLE_DIR/network/public"; then - AC_ADD_INCLUDE($ORACLE_DIR/network/public) + PHP_ADD_INCLUDE($ORACLE_DIR/network/public) fi if test -d "$ORACLE_DIR/plsql/public"; then - AC_ADD_INCLUDE($ORACLE_DIR/plsql/public) + PHP_ADD_INCLUDE($ORACLE_DIR/plsql/public) fi if test -f "$ORACLE_DIR/lib/sysliblist"; then @@ -65,23 +65,23 @@ case $ORACLE_VERSION in 7.0|7.1) if test -f $ORACLE_DIR/lib/liboracle.s?; then - AC_ADD_LIBRARY_WITH_PATH(oracle, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(oracle, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) else - AC_ADD_LIBRARY_WITH_PATH(core, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(cv6, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(nlsrtl, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(core, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(cv6, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(nlsrtl, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(ora, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(core, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(cv6, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(nlsrtl, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(core, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(cv6, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(nlsrtl, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(ora, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, +ORACLE_SHARED_LIBADD) if test "$ext_shared" = "yes"; then ORACLE_SHARED_LIBADD="$ORACLE_DIR/lib/osntab.o $ORACLE_SHARED_LIBADD"; else LIBS="$ORACLE_DIR/lib/osntab.o $LIBS"; fi - AC_ADD_LIBRARY_WITH_PATH(ocic, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(ocic, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) if test "`uname -s 2>/dev/null`" = "AIX"; then if test "$ext_shared" = "yes"; then ORACLE_SHARED_LIBADD="$ORACLE_SHARED_LIBADD -bI:$ORACLE_DIR/lib/mili.exp" @@ -94,61 +94,61 @@ 7.2) if test -f $ORACLE_DIR/lib/libclntsh.s?; then - AC_ADD_LIBRARY_WITH_PATH(clntsh, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(clntsh, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) else - AC_ADD_LIBRARY_WITH_PATH(core3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(nlsrtl3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(c3v6, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(nlsrtl3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(ora, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(ora, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(core3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(c3v6, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(ora, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(ora, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) if test "$ext_shared" = "yes"; then ORACLE_SHARED_LIBADD="$ORACLE_DIR/lib/osntab.o $ORACLE_SHARED_LIBADD"; else LIBS="$ORACLE_DIR/lib/osntab.o $LIBS"; fi - AC_ADD_LIBRARY_WITH_PATH(ocic, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(ocic, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) fi ;; 7.3) if test -f $ORACLE_DIR/lib/libclntsh.s?; then - AC_ADD_LIBRARY_WITH_PATH(clntsh, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(clntsh, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) else - AC_ADD_LIBRARY_WITH_PATH(core3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(nlsrtl3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(core3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(c3v6, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(nlsrtl3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(epc, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(generic, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(common, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(client, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(ncr, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(generic, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(common, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(client, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(ncr, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(client, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(core3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(core3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(c3v6, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(epc, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(generic, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(common, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(client, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(ncr, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(generic, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(common, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(client, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(ncr, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(client, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) fi ;; 8.0) - AC_ADD_LIBRARY_WITH_PATH(nlsrtl3, "", ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(core4, "", ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(psa, "", ORACLE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(clntsh, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, "", ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(core4, "", ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(psa, "", ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(clntsh, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) ;; 8.1) - AC_ADD_LIBRARY(clntsh, 1, ORACLE_SHARED_LIBADD) - AC_ADD_LIBPATH($ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY(clntsh, 1, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBPATH($ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) ;; *) AC_MSG_ERROR(Unsupported Oracle version!) Index: php4/ext/ovrimos/config.m4 diff -u php4/ext/ovrimos/config.m4:1.1 php4/ext/ovrimos/config.m4:1.2 --- php4/ext/ovrimos/config.m4:1.1 Wed Oct 11 09:54:22 2000 +++ php4/ext/ovrimos/config.m4 Tue Mar 27 12:34:38 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.1 2000/10/11 16:54:22 nmav Exp $ +dnl $Id: config.m4,v 1.2 2001/03/27 20:34:38 sniper Exp $ dnl config.m4 for extension ovrimos dnl don't forget to call PHP_EXTENSION(ovrimos) @@ -17,11 +17,11 @@ AC_MSG_ERROR(Please reinstall Ovrimos' libsqlcli - I cannot find sqlcli.h) fi - AC_ADD_INCLUDE($OVRIMOS_DIR/include) + PHP_ADD_INCLUDE($OVRIMOS_DIR/include) PHP_SUBST(OVRIMOS_SHARED_LIBADD) LDFLAGS="$LDFLAGS $ld_runpath_switch$OVRIMOS_DIR/lib -L$OVRIMOS_DIR/lib" AC_CHECK_LIB(sqlcli, main) - AC_ADD_LIBRARY_WITH_PATH(sqlcli, $OVRIMOS_DIR/lib, OVRIMOS_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(sqlcli, $OVRIMOS_DIR/lib, OVRIMOS_SHARED_LIBADD) AC_DEFINE(HAVE_LIBSQLCLI,1,[ ]) PHP_EXTENSION(ovrimos, $ext_shared) Index: php4/ext/pcre/config.m4 diff -u php4/ext/pcre/config.m4:1.22 php4/ext/pcre/config.m4:1.23 --- php4/ext/pcre/config.m4:1.22 Tue Feb 20 23:09:22 2001 +++ php4/ext/pcre/config.m4 Tue Mar 27 12:34:38 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.22 2001/02/21 07:09:22 sas Exp $ +dnl $Id: config.m4,v 1.23 2001/03/27 20:34:38 sniper Exp $ dnl config.m4 for extension pcre dnl By default we'll compile and link against the bundled PCRE library @@ -50,9 +50,9 @@ AC_MSG_ERROR(Could not find libpcre.a in $PHP_PCRE_REGEX) fi - AC_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR, PCRE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR, PCRE_SHARED_LIBADD) - AC_ADD_INCLUDE($PCRE_INCDIR) + PHP_ADD_INCLUDE($PCRE_INCDIR) AC_DEFINE(HAVE_PCRE, 1, [ ]) fi fi Index: php4/ext/pdf/config.m4 diff -u php4/ext/pdf/config.m4:1.16 php4/ext/pdf/config.m4:1.17 --- php4/ext/pdf/config.m4:1.16 Fri Mar 16 04:23:30 2001 +++ php4/ext/pdf/config.m4 Tue Mar 27 12:34:39 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.16 2001/03/16 12:23:30 sas Exp $ +dnl $Id: config.m4,v 1.17 2001/03/27 20:34:39 sniper Exp $ PHP_ARG_WITH(pdflib,whether to include PDFlib support, [ --with-pdflib[=DIR] Include pdflib 3.x support. DIR is the pdflib @@ -20,11 +20,11 @@ LIBS=$old_LIBS LDFLAGS=$old_LDFLAGS PHP_SUBST(PDFLIB_SHARED_LIBADD) - AC_ADD_LIBRARY(pdf, PDFLIB_SHARED_LIBADD) - AC_ADD_LIBRARY(tiff) - AC_ADD_LIBRARY(png) - AC_ADD_LIBRARY(jpeg) - AC_ADD_LIBRARY(z) + PHP_ADD_LIBRARY(pdf, PDFLIB_SHARED_LIBADD) + PHP_ADD_LIBRARY(tiff) + PHP_ADD_LIBRARY(png) + PHP_ADD_LIBRARY(jpeg) + PHP_ADD_LIBRARY(z) ;; no) ;; @@ -45,10 +45,10 @@ LIBS="$LIBS -L$withval/lib" AC_CHECK_LIB(z,deflate, [PDFLIB_LIBS="-L$withval/lib -lz"],[AC_MSG_RESULT(no)],) LIBS=$old_LIBS - AC_ADD_LIBRARY_WITH_PATH(z, $withval/lib) + PHP_ADD_LIBRARY_WITH_PATH(z, $withval/lib) ],[ AC_CHECK_LIB(z,deflate, ,[AC_MSG_RESULT(no, try --with-zlib=<DIR>)],) - AC_ADD_LIBRARY(z) + PHP_ADD_LIBRARY(z) LIBS="$LIBS -lz" ]) else @@ -66,11 +66,11 @@ LIBS="$LIBS -L$withval/lib" AC_CHECK_LIB(jpeg,jpeg_read_header, [PDFLIB_LIBS="$PDFLIB_LIBS -L$withval/lib -ljpeg"],[AC_MSG_RESULT(no)],) LIBS=$old_LIBS - AC_ADD_LIBRARY_WITH_PATH(jpeg, $withval/lib) + PHP_ADD_LIBRARY_WITH_PATH(jpeg, $withval/lib) LIBS="$LIBS -L$withval/lib -ljpeg" ],[ AC_CHECK_LIB(jpeg,jpeg_read_header, ,[AC_MSG_RESULT(no, try --with-jpeg-dir=<DIR>)],) - AC_ADD_LIBRARY(jpeg) + PHP_ADD_LIBRARY(jpeg) LIBS="$LIBS -ljpeg" ]) @@ -83,11 +83,11 @@ LIBS="$LIBS -L$withval/lib" AC_CHECK_LIB(png,png_create_info_struct, [PDFLIB_LIBS="$PDFLIB_LIBS -L$withval/lib -lpng"],[AC_MSG_RESULT(no)],) LIBS=$old_LIBS - AC_ADD_LIBRARY_WITH_PATH(png, $withval/lib) + PHP_ADD_LIBRARY_WITH_PATH(png, $withval/lib) LIBS="$LIBS -L$withval/lib -lpng" ],[ AC_CHECK_LIB(png,png_create_info_struct, ,[AC_MSG_RESULT(no, try --with-png-dir=<DIR>)],) - AC_ADD_LIBRARY(png) + PHP_ADD_LIBRARY(png) LIBS="$LIBS -lpng" ]) @@ -100,11 +100,11 @@ LIBS="$LIBS -L$withval/lib" AC_CHECK_LIB(tiff,TIFFOpen, [PDFLIB_LIBS="$PDFLIB_LIBS -L$withval/lib -ltiff"],[AC_MSG_RESULT(no)],) LIBS=$old_LIBS - AC_ADD_LIBRARY_WITH_PATH(tiff, $withval/lib) + PHP_ADD_LIBRARY_WITH_PATH(tiff, $withval/lib) LIBS="$LIBS -L$withval/lib -ltiff" ],[ AC_CHECK_LIB(tiff,TIFFOpen, ,[AC_MSG_RESULT(no, Try --with-tiff-dir=<DIR>)],) - AC_ADD_LIBRARY(tiff) + PHP_ADD_LIBRARY(tiff) LIBS="$LIBS -ltiff" ]) withval=$old_withval @@ -119,7 +119,7 @@ ]) LIBS=$old_LIBS PHP_SUBST(PDFLIB_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(pdf, $withval/lib, PDFLIB_SHARED_LIBADD) - AC_ADD_INCLUDE($PDFLIB_INCLUDE) + PHP_ADD_LIBRARY_WITH_PATH(pdf, $withval/lib, PDFLIB_SHARED_LIBADD) + PHP_ADD_INCLUDE($PDFLIB_INCLUDE) fi ;; esac Index: php4/ext/pfpro/config.m4 diff -u php4/ext/pfpro/config.m4:1.3 php4/ext/pfpro/config.m4:1.4 --- php4/ext/pfpro/config.m4:1.3 Mon Oct 2 10:35:57 2000 +++ php4/ext/pfpro/config.m4 Tue Mar 27 12:34:39 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.3 2000/10/02 17:35:57 rasmus Exp $ +dnl $Id: config.m4,v 1.4 2001/03/27 20:34:39 sniper Exp $ dnl config.m4 for extension pfpro PHP_ARG_WITH(pfpro, whether to include Verisign Payflow Pro support, @@ -34,10 +34,10 @@ AC_MSG_RESULT(found in $PFPRO_LIB_DIR) - AC_ADD_INCLUDE($PFPRO_INC_DIR) + PHP_ADD_INCLUDE($PFPRO_INC_DIR) PHP_SUBST(PFPRO_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(pfpro, $PFPRO_LIB_DIR, PFPRO_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(pfpro, $PFPRO_LIB_DIR, PFPRO_SHARED_LIBADD) AC_DEFINE(HAVE_PFPRO, 1, [ ]) Index: php4/ext/pgsql/config.m4 diff -u php4/ext/pgsql/config.m4:1.20 php4/ext/pgsql/config.m4:1.21 --- php4/ext/pgsql/config.m4:1.20 Mon Feb 19 08:31:17 2001 +++ php4/ext/pgsql/config.m4 Tue Mar 27 12:34:40 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.20 2001/02/19 16:31:17 sas Exp $ +dnl $Id: config.m4,v 1.21 2001/03/27 20:34:40 sniper Exp $ AC_DEFUN(PGSQL_INC_CHK,[if test -r $i$1/libpq-fe.h; then PGSQL_DIR=$i; PGSQL_INCDIR=$i$1]) @@ -9,7 +9,7 @@ to build as a dl and still specify DIR.]) if test "$PHP_PGSQL" != "no"; then - AC_EXPAND_PATH($PHP_PGSQL, PHP_PGSQL) + PHP_EXPAND_PATH($PHP_PGSQL, PHP_PGSQL) for i in /usr /usr/local /usr/local/pgsql $PHP_PGSQL; do PGSQL_INC_CHK(/include) el[]PGSQL_INC_CHK(/include/pgsql) @@ -37,7 +37,7 @@ AC_DEFINE(HAVE_PGSQL,1,[ ]) - AC_ADD_LIBRARY_WITH_PATH(pq, $PGSQL_LIBDIR, PGSQL_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(pq, $PGSQL_LIBDIR, PGSQL_SHARED_LIBADD) PHP_EXTENSION(pgsql,$ext_shared) fi Index: php4/ext/pspell/config.m4 diff -u php4/ext/pspell/config.m4:1.2 php4/ext/pspell/config.m4:1.3 --- php4/ext/pspell/config.m4:1.2 Thu Jul 13 13:39:14 2000 +++ php4/ext/pspell/config.m4 Tue Mar 27 12:34:40 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.2 2000/07/13 20:39:14 vlad Exp $ +dnl $Id: config.m4,v 1.3 2001/03/27 20:34:40 sniper Exp $ PHP_ARG_WITH(pspell,whether to include pspell support, [ --with-pspell[=DIR] Include PSPELL support.]) @@ -23,6 +23,6 @@ AC_DEFINE(HAVE_PSPELL,1,[ ]) PHP_SUBST(PSPELL_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(pspell, $PSPELL_LIBDIR, PSPELL_SHARED_LIBADD) - AC_ADD_INCLUDE($PSPELL_INCDIR) + PHP_ADD_LIBRARY_WITH_PATH(pspell, $PSPELL_LIBDIR, PSPELL_SHARED_LIBADD) + PHP_ADD_INCLUDE($PSPELL_INCDIR) fi Index: php4/ext/qtdom/config.m4 diff -u php4/ext/qtdom/config.m4:1.3 php4/ext/qtdom/config.m4:1.4 --- php4/ext/qtdom/config.m4:1.3 Tue Mar 20 11:19:30 2001 +++ php4/ext/qtdom/config.m4 Tue Mar 27 12:34:40 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.3 2001/03/20 19:19:30 thies Exp $ +dnl $Id: config.m4,v 1.4 2001/03/27 20:34:40 sniper Exp $ dnl config.m4 for extension qtdom dnl don't forget to call PHP_EXTENSION(qtdom) @@ -12,15 +12,15 @@ yes) if test -f $QTDIR/include/qdom.h; then AC_MSG_RESULT(yes) - AC_ADD_LIBRARY_WITH_PATH(qt, $QTDIR/lib) - AC_ADD_INCLUDE($QTDIR/include) + PHP_ADD_LIBRARY_WITH_PATH(qt, $QTDIR/lib) + PHP_ADD_INCLUDE($QTDIR/include) AC_DEFINE(HAVE_QTDOM, 1, [Wheter you have qtdom]) PHP_EXTENSION(qtdom, $ext_shared) PHP_REQUIRE_CXX elif test -f /usr/lib/qt2/include/qdom.h; then AC_MSG_RESULT(yes) - AC_ADD_LIBRARY(qt) - AC_ADD_INCLUDE(/usr/lib/qt2/include) + PHP_ADD_LIBRARY(qt) + PHP_ADD_INCLUDE(/usr/lib/qt2/include) AC_DEFINE(HAVE_QTDOM, 1, [Wheter you have qtdom]) PHP_EXTENSION(qtdom, $ext_shared) PHP_REQUIRE_CXX Index: php4/ext/readline/config.m4 diff -u php4/ext/readline/config.m4:1.9 php4/ext/readline/config.m4:1.10 --- php4/ext/readline/config.m4:1.9 Thu Jan 18 03:42:09 2001 +++ php4/ext/readline/config.m4 Tue Mar 27 12:34:41 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.9 2001/01/18 11:42:09 stas Exp $ +dnl $Id: config.m4,v 1.10 2001/03/27 20:34:41 sniper Exp $ dnl config.m4 for extension readline dnl don't forget to call PHP_EXTENSION(readline) @@ -19,16 +19,16 @@ if test -z "$READLINE_DIR"; then AC_MSG_ERROR(Please reinstall readline - I cannot find readline.h) fi - AC_ADD_INCLUDE($READLINE_DIR/include) + PHP_ADD_INCLUDE($READLINE_DIR/include) AC_CHECK_LIB(ncurses, tgetent, [ - AC_ADD_LIBRARY_WITH_PATH(ncurses,,READLINE_SHARED_LIBADD)],[ + PHP_ADD_LIBRARY_WITH_PATH(ncurses,,READLINE_SHARED_LIBADD)],[ AC_CHECK_LIB(termcap, tgetent, [ - AC_ADD_LIBRARY_WITH_PATH(termcap,,READLINE_SHARED_LIBADD)]) + PHP_ADD_LIBRARY_WITH_PATH(termcap,,READLINE_SHARED_LIBADD)]) ]) - AC_ADD_LIBRARY_WITH_PATH(history, $READLINE_DIR/lib, READLINE_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(readline, $READLINE_DIR/lib, READLINE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(history, $READLINE_DIR/lib, READLINE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(readline, $READLINE_DIR/lib, READLINE_SHARED_LIBADD) PHP_SUBST(READLINE_SHARED_LIBADD) AC_DEFINE(HAVE_LIBREADLINE, 1, [ ]) @@ -45,15 +45,15 @@ if test -z "$LIBEDIT_DIR"; then AC_MSG_ERROR(Please reinstall libedit - I cannot find readline.h) fi - AC_ADD_INCLUDE($LIBEDIT_DIR/include) + PHP_ADD_INCLUDE($LIBEDIT_DIR/include) AC_CHECK_LIB(ncurses, tgetent, [ - AC_ADD_LIBRARY_WITH_PATH(ncurses,,READLINE__SHARED_LIBADD)],[ + PHP_ADD_LIBRARY_WITH_PATH(ncurses,,READLINE__SHARED_LIBADD)],[ AC_CHECK_LIB(termcap, tgetent, [ - AC_ADD_LIBRARY_WITH_PATH(termcap,,READLINE_SHARED_LIBADD)]) + PHP_ADD_LIBRARY_WITH_PATH(termcap,,READLINE_SHARED_LIBADD)]) ]) - AC_ADD_LIBRARY_WITH_PATH(edit, $LIBEDIT_DIR/lib, READLINE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(edit, $LIBEDIT_DIR/lib, READLINE_SHARED_LIBADD) PHP_SUBST(READLINE_SHARED_LIBADD) AC_DEFINE(HAVE_LIBEDIT, 1, [ ]) Index: php4/ext/recode/config.m4 diff -u php4/ext/recode/config.m4:1.4 php4/ext/recode/config.m4:1.5 --- php4/ext/recode/config.m4:1.4 Tue Jun 6 07:13:35 2000 +++ php4/ext/recode/config.m4 Tue Mar 27 12:34:41 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.4 2000/06/06 14:13:35 thies Exp $ +dnl $Id: config.m4,v 1.5 2001/03/27 20:34:41 sniper Exp $ dnl config.m4 for extension recode dnl don't forget to call PHP_EXTENSION(recode) @@ -49,12 +49,12 @@ AC_MSG_ERROR(Please reinstall recode - I cannot find librecode.a) fi - AC_ADD_INCLUDE($RECODE_DIR/$RECODE_INC) + PHP_ADD_INCLUDE($RECODE_DIR/$RECODE_INC) if test "$ext_shared" = "yes"; then - AC_ADD_LIBRARY_WITH_PATH(recode, $RECODE_DIR/$RECODE_LIB, RECODE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(recode, $RECODE_DIR/$RECODE_LIB, +RECODE_SHARED_LIBADD) PHP_SUBST(RECODE_SHARED_LIBADD) else - AC_ADD_LIBRARY_DEFER_WITH_PATH(recode, $RECODE_DIR/$RECODE_LIB) + PHP_ADD_LIBRARY_DEFER_WITH_PATH(recode, +$RECODE_DIR/$RECODE_LIB) fi AC_DEFINE(HAVE_LIBRECODE, 1, [Whether we have librecode 3.5 or higher]) Index: php4/ext/sablot/config.m4 diff -u php4/ext/sablot/config.m4:1.13 php4/ext/sablot/config.m4:1.14 --- php4/ext/sablot/config.m4:1.13 Thu Jan 18 07:09:35 2001 +++ php4/ext/sablot/config.m4 Tue Mar 27 12:34:42 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.13 2001/01/18 15:09:35 sniper Exp $ +dnl $Id: config.m4,v 1.14 2001/03/27 20:34:42 sniper Exp $ dnl config.m4 for extension Sablot PHP_ARG_WITH(expat-dir, for Sablotron XSL support, @@ -25,10 +25,10 @@ AC_MSG_ERROR(Please reinstall the Sablotron distribution) fi - AC_ADD_INCLUDE($SABLOT_DIR/include) + PHP_ADD_INCLUDE($SABLOT_DIR/include) PHP_SUBST(SABLOT_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(sablot, $SABLOT_DIR/lib, SABLOT_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(sablot, $SABLOT_DIR/lib, SABLOT_SHARED_LIBADD) if test -z "$PHP_EXPAT_DIR"; then PHP_EXPAT_DIR="" @@ -38,16 +38,16 @@ for i in $PHP_EXPAT_DIR $SABLOT_DIR; do if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.so; then AC_DEFINE(HAVE_LIBEXPAT2,1,[ ]) - AC_ADD_LIBRARY_WITH_PATH(expat, $i/lib) - AC_ADD_INCLUDE($i/include) + PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib) + PHP_ADD_INCLUDE($i/include) AC_CHECK_LIB(sablot, SablotSetEncoding, AC_DEFINE(HAVE_SABLOT_SET_ENCODING,1,[ ])) testval=yes fi done if test "$testval" = "no"; then - AC_ADD_LIBRARY(xmlparse) - AC_ADD_LIBRARY(xmltok) + PHP_ADD_LIBRARY(xmlparse) + PHP_ADD_LIBRARY(xmltok) fi AC_DEFINE(HAVE_SABLOT,1,[ ]) Index: php4/ext/session/config.m4 diff -u php4/ext/session/config.m4:1.9 php4/ext/session/config.m4:1.10 --- php4/ext/session/config.m4:1.9 Mon May 1 21:01:15 2000 +++ php4/ext/session/config.m4 Tue Mar 27 12:34:42 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.9 2000/05/02 04:01:15 sas Exp $ +dnl $Id: config.m4,v 1.10 2001/03/27 20:34:42 sniper Exp $ PHP_ARG_WITH(mm,for mm support, [ --with-mm[=DIR] Include mm support for session storage]) @@ -20,8 +20,8 @@ AC_MSG_ERROR(cannot find mm library) fi - AC_ADD_LIBRARY_WITH_PATH(mm, $MM_DIR/lib, SESSION_SHARED_LIBADD) - AC_ADD_INCLUDE($MM_DIR/include) + PHP_ADD_LIBRARY_WITH_PATH(mm, $MM_DIR/lib, SESSION_SHARED_LIBADD) + PHP_ADD_INCLUDE($MM_DIR/include) AC_DEFINE(HAVE_LIBMM, 1, [Whether you have libmm]) PHP_MODULE_PTR(phpext_ps_mm_ptr) fi Index: php4/ext/snmp/config.m4 diff -u php4/ext/snmp/config.m4:1.16 php4/ext/snmp/config.m4:1.17 --- php4/ext/snmp/config.m4:1.16 Sat Oct 28 11:26:45 2000 +++ php4/ext/snmp/config.m4 Tue Mar 27 12:34:42 2001 @@ -27,8 +27,8 @@ SNMP_LIBDIR=$PHP_SNMP/lib fi AC_DEFINE(HAVE_SNMP,1,[ ]) - AC_ADD_INCLUDE($SNMP_INCDIR) - AC_ADD_LIBRARY_WITH_PATH(snmp, $SNMP_LIBDIR, SNMP_SHARED_LIBADD) + PHP_ADD_INCLUDE($SNMP_INCDIR) + PHP_ADD_LIBRARY_WITH_PATH(snmp, $SNMP_LIBDIR, SNMP_SHARED_LIBADD) old_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$INCLUDES $CPPFLAGS" AC_CHECK_HEADERS(default_store.h) @@ -52,7 +52,7 @@ PHP_EXTENSION(snmp,$ext_shared) PHP_SUBST(SNMP_SHARED_LIBADD) AC_CHECK_LIB(kstat, kstat_read, [ - AC_ADD_LIBRARY(kstat,SNMP_SHARED_LIBADD) + PHP_ADD_LIBRARY(kstat,SNMP_SHARED_LIBADD) ]) SNMP_INCLUDE="-I$SNMP_INCDIR" fi Index: php4/ext/swf/config.m4 diff -u php4/ext/swf/config.m4:1.9 php4/ext/swf/config.m4:1.10 --- php4/ext/swf/config.m4:1.9 Mon Oct 9 12:10:39 2000 +++ php4/ext/swf/config.m4 Tue Mar 27 12:34:43 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.9 2000/10/09 19:10:39 andrei Exp $ +dnl $Id: config.m4,v 1.10 2001/03/27 20:34:43 sniper Exp $ dnl config.m4 for extension libswf PHP_ARG_WITH(swf, for libswf support, @@ -24,10 +24,10 @@ libswf.a should be in <swf-dir>/lib) fi - AC_ADD_INCLUDE($SWF_DIR/include) + PHP_ADD_INCLUDE($SWF_DIR/include) PHP_SUBST(SWF_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(swf, $SWF_DIR/lib, SWF_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(swf, $SWF_DIR/lib, SWF_SHARED_LIBADD) AC_DEFINE(HAVE_SWF,1,[ ]) PHP_EXTENSION(swf, $ext_shared) Index: php4/ext/sybase/config.m4 diff -u php4/ext/sybase/config.m4:1.6 php4/ext/sybase/config.m4:1.7 --- php4/ext/sybase/config.m4:1.6 Mon May 1 21:27:02 2000 +++ php4/ext/sybase/config.m4 Tue Mar 27 12:34:43 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.6 2000/05/02 04:27:02 sas Exp $ +dnl $Id: config.m4,v 1.7 2001/03/27 20:34:43 sniper Exp $ PHP_ARG_WITH(sybase,for Sybase support, [ --with-sybase[=DIR] Include Sybase-DB support. DIR is the Sybase home @@ -13,11 +13,11 @@ SYBASE_INCDIR=$PHP_SYBASE/include SYBASE_LIBDIR=$PHP_SYBASE/lib fi - AC_ADD_INCLUDE($SYBASE_INCDIR) - AC_ADD_LIBRARY_WITH_PATH(sybdb, $SYBASE_LIBDIR, SYBASE_SHARED_LIBADD) + PHP_ADD_INCLUDE($SYBASE_INCDIR) + PHP_ADD_LIBRARY_WITH_PATH(sybdb, $SYBASE_LIBDIR, SYBASE_SHARED_LIBADD) PHP_EXTENSION(sybase, $ext_shared) AC_CHECK_LIB(dnet_stub, dnet_addr, - [ AC_ADD_LIBRARY_WITH_PATH(dnet_stub,,SYBASE_SHARED_LIBADD) + [ PHP_ADD_LIBRARY_WITH_PATH(dnet_stub,,SYBASE_SHARED_LIBADD) AC_DEFINE(HAVE_LIBDNET_STUB,1,[ ]) ]) AC_DEFINE(HAVE_SYBASE,1,[ ]) Index: php4/ext/sybase_ct/config.m4 diff -u php4/ext/sybase_ct/config.m4:1.4 php4/ext/sybase_ct/config.m4:1.5 --- php4/ext/sybase_ct/config.m4:1.4 Sat Jun 24 02:01:51 2000 +++ php4/ext/sybase_ct/config.m4 Tue Mar 27 12:34:43 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.4 2000/06/24 09:01:51 joey Exp $ +dnl $Id: config.m4,v 1.5 2001/03/27 20:34:43 sniper Exp $ AC_MSG_CHECKING(for Sybase-CT support) AC_ARG_WITH(sybase-ct, @@ -18,23 +18,23 @@ SYBASE_CT_INCDIR=$withval/include SYBASE_CT_LIBDIR=$withval/lib fi - AC_ADD_INCLUDE($SYBASE_CT_INCDIR) - AC_ADD_LIBPATH($SYBASE_CT_LIBDIR) - AC_ADD_LIBRARY(cs) - AC_ADD_LIBRARY(ct) - AC_ADD_LIBRARY(comn) - AC_ADD_LIBRARY(intl) + PHP_ADD_INCLUDE($SYBASE_CT_INCDIR) + PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR) + PHP_ADD_LIBRARY(cs) + PHP_ADD_LIBRARY(ct) + PHP_ADD_LIBRARY(comn) + PHP_ADD_LIBRARY(intl) SYBASE_CT_LIBS="-lcs -lct -lcomn -lintl" old_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -L$SYBASE_CT_LIBDIR" AC_CHECK_LIB(tcl, netg_errstr, - [ AC_ADD_LIBRARY(tcl) ], - [ AC_ADD_LIBRARY(sybtcl) ], + [ PHP_ADD_LIBRARY(tcl) ], + [ PHP_ADD_LIBRARY(sybtcl) ], [ $SYBASE_CT_LIBS ]) AC_CHECK_LIB(insck, insck__getVdate, - [ AC_ADD_LIBRARY(insck) ]) + [ PHP_ADD_LIBRARY(insck) ]) AC_CHECK_LIB(insck, bsd_tcp, - [ AC_ADD_LIBRARY(insck) ]) + [ PHP_ADD_LIBRARY(insck) ]) LDFLAGS=$old_LDFLAGS else AC_MSG_RESULT(no) Index: php4/ext/vpopmail/config.m4 diff -u php4/ext/vpopmail/config.m4:1.4 php4/ext/vpopmail/config.m4:1.5 --- php4/ext/vpopmail/config.m4:1.4 Tue Jan 23 13:46:03 2001 +++ php4/ext/vpopmail/config.m4 Tue Mar 27 12:34:44 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.4 2001/01/23 21:46:03 bbonev Exp $ +dnl $Id: config.m4,v 1.5 2001/03/27 20:34:44 sniper Exp $ dnl config.m4 for extension vpopmail PHP_ARG_WITH(vpopmail, for vpopmail support, @@ -38,10 +38,10 @@ AC_MSG_RESULT($VPOPMAIL_DIR) - AC_ADD_INCLUDE($VPOPMAIL_INC_DIR) + PHP_ADD_INCLUDE($VPOPMAIL_INC_DIR) PHP_SUBST(VPOPMAIL_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(vpopmail, $VPOPMAIL_LIB_DIR, VPOPMAIL_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(vpopmail, $VPOPMAIL_LIB_DIR, VPOPMAIL_SHARED_LIBADD) AC_DEFINE(HAVE_VPOPMAIL,1,[Whether you have vpopmail]) AC_DEFINE_UNQUOTED(VPOPMAIL_BIN_DIR,"$VPOPMAIL_BIN_DIR",[vpopmail bin path]) Index: php4/ext/xml/config.m4 diff -u php4/ext/xml/config.m4:1.24 php4/ext/xml/config.m4:1.25 --- php4/ext/xml/config.m4:1.24 Wed Jan 10 06:41:01 2001 +++ php4/ext/xml/config.m4 Tue Mar 27 12:34:44 2001 @@ -1,5 +1,5 @@ # $Source: /local/repository/php4/ext/xml/config.m4,v $ -# $Id: config.m4,v 1.24 2001/01/10 14:41:01 hirokawa Exp $ +# $Id: config.m4,v 1.25 2001/03/27 20:34:44 sniper Exp $ dnl Fallback for --with-xml[=DIR] AC_ARG_WITH(xml,[],enable_xml=$withval) @@ -30,8 +30,8 @@ LIB_BUILD($ext_builddir/expat,$ext_shared,yes) LIB_BUILD($ext_builddir/expat/xmlparse,$ext_shared,yes) LIB_BUILD($ext_builddir/expat/xmltok,$ext_shared,yes) - AC_ADD_INCLUDE($ext_srcdir/expat/xmltok) - AC_ADD_INCLUDE($ext_srcdir/expat/xmlparse) + PHP_ADD_INCLUDE($ext_srcdir/expat/xmltok) + PHP_ADD_INCLUDE($ext_srcdir/expat/xmlparse) PHP_FAST_OUTPUT($ext_builddir/expat/Makefile $ext_builddir/expat/xmlparse/Makefile $ext_builddir/expat/xmltok/Makefile) else @@ -39,14 +39,14 @@ EXPAT_DIR="$withval" if test -f $EXPAT_DIR/lib/libexpat.a -o -f $EXPAT_DIR/lib/libexpat.so ; then AC_DEFINE(HAVE_LIBEXPAT2, 1, [ ]) - AC_ADD_INCLUDE($EXPAT_DIR/include) + PHP_ADD_INCLUDE($EXPAT_DIR/include) else AC_MSG_RESULT(not found) AC_MSG_ERROR(Please reinstall the expat distribution) fi PHP_SUBST(EXPAT_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, EXPAT_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, EXPAT_SHARED_LIBADD) PHP_EXTENSION(xml, $ext_shared) fi fi Index: php4/ext/zlib/config.m4 diff -u php4/ext/zlib/config.m4:1.10 php4/ext/zlib/config.m4:1.11 --- php4/ext/zlib/config.m4:1.10 Tue Nov 21 00:38:20 2000 +++ php4/ext/zlib/config.m4 Tue Mar 27 12:34:44 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.10 2000/11/21 08:38:20 hholzgra Exp $ +dnl $Id: config.m4,v 1.11 2001/03/27 20:34:44 sniper Exp $ @@ -38,9 +38,9 @@ ]) PHP_SUBST(ZLIB_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(z, $ZLIB_LIBDIR, ZLIB_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(z, $ZLIB_LIBDIR, ZLIB_SHARED_LIBADD) - AC_ADD_INCLUDE($ZLIB_INCDIR) + PHP_ADD_INCLUDE($ZLIB_INCDIR) PHP_FOPENCOOKIE fi Index: php4/ext/zziplib/config.m4 diff -u php4/ext/zziplib/config.m4:1.1 php4/ext/zziplib/config.m4:1.2 --- php4/ext/zziplib/config.m4:1.1 Tue Nov 21 17:28:51 2000 +++ php4/ext/zziplib/config.m4 Tue Mar 27 12:34:44 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.1 2000/11/22 01:28:51 hholzgra Exp $ +dnl $Id: config.m4,v 1.2 2001/03/27 20:34:44 sniper Exp $ dnl config.m4 for extension zziplib PHP_ARG_WITH(zziplib,whether to include zziplib support, @@ -31,9 +31,9 @@ ]) PHP_SUBST(ZZIPLIB_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(zzip, $ZZIPLIB_LIBDIR, ZZIPLIB_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(zzip, $ZZIPLIB_LIBDIR, ZZIPLIB_SHARED_LIBADD) - AC_ADD_INCLUDE($ZZIPLIB_INCDIR) + PHP_ADD_INCLUDE($ZZIPLIB_INCDIR) PHP_FOPENCOOKIE fi Index: php4/sapi/aolserver/config.m4 diff -u php4/sapi/aolserver/config.m4:1.10 php4/sapi/aolserver/config.m4:1.11 --- php4/sapi/aolserver/config.m4:1.10 Mon Oct 30 03:44:18 2000 +++ php4/sapi/aolserver/config.m4 Tue Mar 27 12:34:44 2001 @@ -1,4 +1,4 @@ -dnl ## $Id: config.m4,v 1.10 2000/10/30 11:44:18 sas Exp $ -*- sh -*- +dnl ## $Id: config.m4,v 1.11 2001/03/27 20:34:44 sniper Exp $ -*- sh -*- AC_MSG_CHECKING(for AOLserver support) AC_ARG_WITH(aolserver, @@ -20,7 +20,7 @@ AC_MSG_ERROR(Please specify the path to the root of AOLserver using --with-aolserver=DIR) fi PHP_BUILD_THREAD_SAFE - AC_ADD_INCLUDE($PHP_AOLSERVER_SRC/include) + PHP_ADD_INCLUDE($PHP_AOLSERVER_SRC/include) AC_DEFINE(HAVE_AOLSERVER,1,[Whether you have AOLserver]) PHP_SAPI=aolserver PHP_BUILD_SHARED Index: php4/sapi/apache/config.m4 diff -u php4/sapi/apache/config.m4:1.35 php4/sapi/apache/config.m4:1.36 --- php4/sapi/apache/config.m4:1.35 Mon Dec 4 08:05:00 2000 +++ php4/sapi/apache/config.m4 Tue Mar 27 12:34:45 2001 @@ -24,7 +24,7 @@ fi fi else - AC_EXPAND_PATH($withval, APXS) + PHP_EXPAND_PATH($withval, APXS) fi if $APXS -q CFLAGS >/dev/null 2>&1; then @@ -47,7 +47,7 @@ -D*) CPPFLAGS="$CPPFLAGS $flag";; esac done - AC_ADD_INCLUDE($APXS_INCLUDEDIR) + PHP_ADD_INCLUDE($APXS_INCLUDEDIR) PHP_SAPI=apache APACHE_INSTALL="$APXS -i -a -n php4 $SAPI_SHARED" PHP_BUILD_SHARED @@ -75,7 +75,7 @@ fi if test "$withval" != "no"; then APACHE_MODULE=yes - AC_EXPAND_PATH($withval, withval) + PHP_EXPAND_PATH($withval, withval) # For Apache 1.2.x if test -f $withval/src/httpd.h; then APACHE_INCLUDE=-I$withval/src Index: php4/sapi/apache2filter/config.m4 diff -u php4/sapi/apache2filter/config.m4:1.2 php4/sapi/apache2filter/config.m4:1.3 --- php4/sapi/apache2filter/config.m4:1.2 Wed Feb 28 06:03:58 2001 +++ php4/sapi/apache2filter/config.m4 Tue Mar 27 12:34:45 2001 @@ -14,7 +14,7 @@ fi fi else - AC_EXPAND_PATH($withval, APXS) + PHP_EXPAND_PATH($withval, APXS) fi if $APXS -q CFLAGS >/dev/null 2>&1; then @@ -27,7 +27,7 @@ APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR` APXS_CFLAGS=`$APXS -q CFLAGS` - AC_ADD_INCLUDE($APXS_INCLUDEDIR) + PHP_ADD_INCLUDE($APXS_INCLUDEDIR) if `echo $APXS_CFLAGS|grep USE_HSREGEX>/dev/null`; then APACHE_HAS_REGEX=yes fi Index: php4/sapi/caudium/config.m4 diff -u php4/sapi/caudium/config.m4:1.6 php4/sapi/caudium/config.m4:1.7 --- php4/sapi/caudium/config.m4:1.6 Fri Dec 1 15:34:01 2000 +++ php4/sapi/caudium/config.m4 Tue Mar 27 12:34:45 2001 @@ -1,4 +1,4 @@ -dnl ## $Id: config.m4,v 1.6 2000/12/01 23:34:01 neotron Exp $ -*- sh -*- +dnl ## $Id: config.m4,v 1.7 2001/03/27 20:34:45 sniper Exp $ -*- sh -*- RESULT=no AC_MSG_CHECKING(for Caudium support) @@ -37,7 +37,7 @@ while(!catch(pike=readlink(pike)) && tries--) ; write(combine_path(dirname(orig), pike)); '` - AC_ADD_INCLUDE($PIKE_INCLUDE_DIR) + PHP_ADD_INCLUDE($PIKE_INCLUDE_DIR) if test "$prefix" != "NONE"; then PIKE_C_INCLUDE=$prefix/include/`basename ${PIKE}` else @@ -66,7 +66,7 @@ fi if test "$PIKE_TEST_VER" = "${PIKE_CMAJOR_VERSION}.${PIKE_CMINOR_VERSION}.${PIKE_CBUILD_VERSION}"; then - AC_ADD_INCLUDE($PIKE_C_INCLUDE) + PHP_ADD_INCLUDE($PIKE_C_INCLUDE) PIKE_INCLUDE_DIR="$PIKE_INCLUDE_DIR, $PIKE_C_INCLUDE" AC_MSG_RESULT(found) else Index: php4/sapi/fastcgi/config.m4 diff -u php4/sapi/fastcgi/config.m4:1.1 php4/sapi/fastcgi/config.m4:1.2 --- php4/sapi/fastcgi/config.m4:1.1 Mon Mar 19 03:03:29 2001 +++ php4/sapi/fastcgi/config.m4 Tue Mar 27 12:34:45 2001 @@ -10,7 +10,7 @@ test -f "$FASTCGIPATH/include/fastcgi.h" || AC_MSG_ERROR(Unable to find fastcgi.h in $FASTCGIPATH/include) PHP_SAPI=fastcgi PHP_LIBS=$FASTCGIPATH/lib/libfcgi.a - AC_ADD_INCLUDE($FASTCGIPATH/include) + PHP_ADD_INCLUDE($FASTCGIPATH/include) EXT_PROGRAM_LDADD="$EXT_PROGRAM_LDADD $FASTCGIPATH/lib/libfcgi.a" INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_PROGRAM \$(bindir)/$SAPI_FASTCGI" RESULT="yes" Index: php4/sapi/isapi/config.m4 diff -u php4/sapi/isapi/config.m4:1.9 php4/sapi/isapi/config.m4:1.10 --- php4/sapi/isapi/config.m4:1.9 Mon Mar 19 03:23:57 2001 +++ php4/sapi/isapi/config.m4 Tue Mar 27 12:34:46 2001 @@ -1,4 +1,4 @@ -dnl ## $Id: config.m4,v 1.9 2001/03/19 11:23:57 joosters Exp $ -*- sh -*- +dnl ## $Id: config.m4,v 1.10 2001/03/27 20:34:46 sniper Exp $ -*- sh -*- RESULT=no AC_MSG_CHECKING(for Zeus ISAPI support) @@ -13,7 +13,7 @@ test -f "$ZEUSPATH/web/include/httpext.h" || AC_MSG_ERROR(Unable to find httpext.h in $ZEUSPATH/web/include) PHP_BUILD_THREAD_SAFE AC_DEFINE(WITH_ZEUS,1,[ ]) - AC_ADD_INCLUDE($ZEUSPATH/web/include) + PHP_ADD_INCLUDE($ZEUSPATH/web/include) PHP_SAPI=isapi PHP_BUILD_SHARED INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED $ZEUSPATH/web/bin/" Index: php4/sapi/nsapi/config.m4 diff -u php4/sapi/nsapi/config.m4:1.7 php4/sapi/nsapi/config.m4:1.8 --- php4/sapi/nsapi/config.m4:1.7 Sun Jun 18 08:30:55 2000 +++ php4/sapi/nsapi/config.m4 Tue Mar 27 12:34:46 2001 @@ -1,4 +1,4 @@ -dnl ## $Id: config.m4,v 1.7 2000/06/18 15:30:55 sas Exp $ -*- sh -*- +dnl ## $Id: config.m4,v 1.8 2001/03/27 20:34:46 sniper Exp $ -*- sh -*- AC_MSG_CHECKING(for NSAPI support) AC_ARG_WITH(nsapi, @@ -23,7 +23,7 @@ else AC_MSG_ERROR(Please check you have nsapi.h in either DIR/include or DIR/plugins/include) fi - AC_ADD_INCLUDE($NSAPI_INCLUDE) + PHP_ADD_INCLUDE($NSAPI_INCLUDE) PHP_BUILD_THREAD_SAFE AC_DEFINE(HAVE_NSAPI,1,[Whether you have a Netscape Server]) PHP_SAPI=nsapi Index: php4/sapi/phttpd/config.m4 diff -u php4/sapi/phttpd/config.m4:1.3 php4/sapi/phttpd/config.m4:1.4 --- php4/sapi/phttpd/config.m4:1.3 Wed Dec 29 18:59:45 1999 +++ php4/sapi/phttpd/config.m4 Tue Mar 27 12:34:46 2001 @@ -1,4 +1,4 @@ -dnl ## $Id: config.m4,v 1.3 1999/12/30 02:59:45 sas Exp $ -*- sh -*- +dnl ## $Id: config.m4,v 1.4 2001/03/27 20:34:46 sniper Exp $ -*- sh -*- RESULT=no AC_MSG_CHECKING(for PHTTPD support) @@ -10,7 +10,7 @@ fi PHP_BUILD_THREAD_SAFE PHTTPD_DIR=$withval - AC_ADD_INCLUDE($PHTTPD_DIR/include) + PHP_ADD_INCLUDE($PHTTPD_DIR/include) AC_DEFINE(HAVE_PHTTPD,1,[Whether you have phttpd]) PHP_SAPI=phttpd PHP_BUILD_SHARED Index: php4/sapi/pi3web/config.m4 diff -u php4/sapi/pi3web/config.m4:1.2 php4/sapi/pi3web/config.m4:1.3 --- php4/sapi/pi3web/config.m4:1.2 Sun Jun 18 08:30:55 2000 +++ php4/sapi/pi3web/config.m4 Tue Mar 27 12:34:50 2001 @@ -10,10 +10,10 @@ test -f "$PI3PATH/PiAPI/PiAPI.h" || AC_MSG_ERROR(Unable to find PiAPI.h in $PI3PATH/PiAPI) PHP_BUILD_THREAD_SAFE AC_DEFINE(WITH_PI3WEB,1,[whether you want Pi3Web support]) - AC_ADD_INCLUDE($PI3PATH/PiAPI) - AC_ADD_INCLUDE($PI3PATH/Pi2API) - AC_ADD_INCLUDE($PI3PATH/Pi3API) - AC_ADD_INCLUDE($PI3PATH/PHP4) + PHP_ADD_INCLUDE($PI3PATH/PiAPI) + PHP_ADD_INCLUDE($PI3PATH/Pi2API) + PHP_ADD_INCLUDE($PI3PATH/Pi3API) + PHP_ADD_INCLUDE($PI3PATH/PHP4) PHP_SAPI=pi3web PHP_BUILD_SHARED INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED $PI3PATH/bin/" Index: php4/sapi/roxen/config.m4 diff -u php4/sapi/roxen/config.m4:1.11 php4/sapi/roxen/config.m4:1.12 --- php4/sapi/roxen/config.m4:1.11 Sun Nov 19 01:06:17 2000 +++ php4/sapi/roxen/config.m4 Tue Mar 27 12:34:50 2001 @@ -1,4 +1,4 @@ -dnl ## $Id: config.m4,v 1.11 2000/11/19 09:06:17 neotron Exp $ -*- sh -*- +dnl ## $Id: config.m4,v 1.12 2001/03/27 20:34:50 sniper Exp $ -*- sh -*- RESULT=no AC_MSG_CHECKING(for Roxen/Pike support) @@ -26,7 +26,7 @@ AC_MSG_ERROR(Roxen/PHP requires Pike 0.7.79 or newer) fi - AC_ADD_INCLUDE($PIKE_INCLUDE_DIR) + PHP_ADD_INCLUDE($PIKE_INCLUDE_DIR) AC_DEFINE(HAVE_ROXEN,1,[Whether you use Roxen]) PHP_SAPI=roxen PHP_BUILD_SHARED Index: php4/sapi/thttpd/config.m4 diff -u php4/sapi/thttpd/config.m4:1.4 php4/sapi/thttpd/config.m4:1.5 --- php4/sapi/thttpd/config.m4:1.4 Wed Dec 6 09:34:54 2000 +++ php4/sapi/thttpd/config.m4 Tue Mar 27 12:34:50 2001 @@ -1,7 +1,7 @@ AC_ARG_WITH(thttpd, [ --with-thttpd=SRCDIR Build PHP as thttpd module],[ test -d $withval || AC_MSG_RESULT(thttpd directory does not exist ($withval)) - AC_EXPAND_PATH($withval, THTTPD) + PHP_EXPAND_PATH($withval, THTTPD) INSTALL_IT="\ echo 'PHP_LIBS = -L. -lphp4 \$(PHP_LIBS) \$(EXTRA_LIBS)' > $THTTPD/php_makefile; \ echo 'PHP_LDFLAGS = \$(NATIVE_RPATHS) \$(PHP_LDFLAGS)' >> $THTTPD/php_makefile; \ @@ -11,7 +11,7 @@ test -f $THTTPD/php_patched || \ (cd $THTTPD && patch < $abs_srcdir/sapi/thttpd/thttpd_patch && touch php_patched)" PHP_THTTPD="yes, using $THTTPD" - AC_ADD_INCLUDE($THTTPD) + PHP_ADD_INCLUDE($THTTPD) PHP_BUILD_STATIC PHP_SAPI=thttpd ],[
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]