67 files changed, 353 insertions, 350 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index ed61e876da..99cc1284bf 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -35,20 +35,20 @@ AC_DEFUN(PHP_SETUP_OPENSSL,[
   ])
   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 @@ AC_DEFUN(PHP_EVAL_LIBLINE,[
     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 @@ AC_DEFUN(PHP_EVAL_INCLINE,[
     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 @@ AC_DEFUN(AC_PHP_ONCE,[
 ])
 
 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 @@ AC_DEFUN(AC_EXPAND_PATH,[
 ])
 
 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 @@ AC_DEFUN(AC_ADD_LIBPATH,[
 ])
 
 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 @@ AC_DEFUN(AC_BUILD_RPATH,[
 ])
 
 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 @@ AC_DEFUN(PHP_X_ADD_LIBRARY,[
 ])
 
 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 @@ ifelse($3,,[
    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 @@ ifelse($3,,[
 ])
 
 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 @@ AC_DEFUN(AM_SET_LIBTOOL_VARIABLE,[
 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 @@ PHP_SUBST(HSREGEX)
 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 @@ AC_DEFUN(AC_MISSING_FCLOSE_DECL,[
 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 http://www.sas.com/standards/large.file/x_open.20Mar96.html
 
 dnl Written by Paul Eggert <eggert@twinsun.com>.
 
-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 @@ AC_DEFUN(AC_SYS_LFS,
   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>],
diff --git a/configure.in b/configure.in
index 54d516d149..43fa4c43bf 100644
--- a/configure.in
+++ b/configure.in
@@ -213,10 +213,10 @@ INCLUDES="$INCLUDES -I\$(top_builddir)/Zend"
 
 
 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 @@ unset ac_cv_func_yp_get_default_domain
 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 @@ if test "`uname -s 2>/dev/null`" != "QNX"; then
 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 @@ PHP_SOCKLEN_T
 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 @@ fi
 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 "$PHP_LIBGCC" = "yes"; then
   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 @@ PHP_ARG_ENABLE(dmalloc,whether to enable dmalloc,
 
 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 @@ PEAR_INSTALLDIR="$prefix/lib/php"
 
 INCLUDE_PATH=".:$PEAR_INSTALLDIR"
 
-AC_BUILD_RPATH
+PHP_BUILD_RPATH
 
 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS"
 
diff --git a/ext/aspell/config.m4 b/ext/aspell/config.m4
index 06b4c276c5..dde5aa2169 100644
--- a/ext/aspell/config.m4
+++ b/ext/aspell/config.m4
@@ -11,8 +11,8 @@ AC_ARG_WITH(aspell,
       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)
diff --git a/ext/ccvs/config.m4 b/ext/ccvs/config.m4
index ef347ffe9c..8f5851ea36 100644
--- a/ext/ccvs/config.m4
+++ b/ext/ccvs/config.m4
@@ -15,8 +15,8 @@ AC_ARG_WITH(ccvs,
 		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
diff --git a/ext/cpdf/config.m4 b/ext/cpdf/config.m4
index 59f2ddb050..c1d6aaa280 100644
--- a/ext/cpdf/config.m4
+++ b/ext/cpdf/config.m4
@@ -14,9 +14,9 @@ AC_ARG_WITH(cpdflib,
       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 @@ AC_ARG_WITH(cpdflib,
           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 @@ AC_ARG_WITH(cpdflib,
           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_ARG_WITH(cpdflib,
         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 ;;
diff --git a/ext/crack/config.m4 b/ext/crack/config.m4
index 08c0235db2..a53e077eca 100644
--- a/ext/crack/config.m4
+++ b/ext/crack/config.m4
@@ -22,8 +22,8 @@ if test "$PHP_CRACK" != "no"; then
 		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)
 
diff --git a/ext/curl/config.m4 b/ext/curl/config.m4
index aa91c673b8..cdccaa7eb4 100644
--- a/ext/curl/config.m4
+++ b/ext/curl/config.m4
@@ -23,10 +23,10 @@ if test "$PHP_CURL" != "no"; then
     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, 
   [ 
diff --git a/ext/cybercash/config.m4 b/ext/cybercash/config.m4
index 9b50aaf6e5..2edb140956 100644
--- a/ext/cybercash/config.m4
+++ b/ext/cybercash/config.m4
@@ -17,8 +17,8 @@ AC_ARG_WITH(cybercash,
 	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
diff --git a/ext/cybermut/config.m4 b/ext/cybermut/config.m4
index dd2bc82205..cf93da9e9f 100644
--- a/ext/cybermut/config.m4
+++ b/ext/cybermut/config.m4
@@ -37,10 +37,10 @@ if test "$PHP_CYBERMUT" != "no"; then
   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, [ ])                                                 
 
diff --git a/ext/dba/config.m4 b/ext/dba/config.m4
index 23f4cabe52..b0271b17dc 100644
--- a/ext/dba/config.m4
+++ b/ext/dba/config.m4
@@ -31,8 +31,8 @@ AC_DEFUN(AC_DBA_STD_CHECK,[
 
 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=""
diff --git a/ext/domxml/config.m4 b/ext/domxml/config.m4
index d2e874d059..29ff87ad59 100644
--- a/ext/domxml/config.m4
+++ b/ext/domxml/config.m4
@@ -44,7 +44,7 @@ if test "$PHP_DOM" != "no"; then
 
   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 @@ if test "$PHP_DOM" != "no"; then
   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 @@ if test "$PHP_DOM" != "no"; then
      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 @@ if test "$PHP_DOM" != "no"; then
   fi
 
   AC_DEFINE(HAVE_DOMXML,1,[ ])
-  AC_ADD_LIBRARY(z)
+  PHP_ADD_LIBRARY(z)
 
   PHP_EXTENSION(domxml, $ext_shared)
 fi
diff --git a/ext/fbsql/config.m4 b/ext/fbsql/config.m4
index 01c30a292a..2289c3c57d 100644
--- a/ext/fbsql/config.m4
+++ b/ext/fbsql/config.m4
@@ -36,6 +36,6 @@ if test "$PHP_FBSQL" != "no"; then
      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
diff --git a/ext/fdf/config.m4 b/ext/fdf/config.m4
index e1556ad939..fb6478b0ae 100644
--- a/ext/fdf/config.m4
+++ b/ext/fdf/config.m4
@@ -21,7 +21,7 @@ if test "$PHP_FDFTK" != "no"; then
     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 @@ if test "$PHP_FDFTK" != "no"; then
   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
diff --git a/ext/fribidi/config.m4 b/ext/fribidi/config.m4
index 2421459130..21bd45d9ab 100644
--- a/ext/fribidi/config.m4
+++ b/ext/fribidi/config.m4
@@ -61,9 +61,9 @@ dnl $PHP_FRIBIDI will be "yes"
     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, [ ])
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index f470264c04..3909c661f9 100644
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -14,7 +14,7 @@ AC_DEFUN(PHP_GD_JPEG,[
             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 @@ AC_DEFUN(PHP_GD_XPM,[
           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_XPM,[
 
 
 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 @@ AC_ARG_WITH(gd,
         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 @@ dnl Check the capabilities of GD lib...
       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 @@ dnl A whole whack of possible places where this might be
           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 @@ dnl Check the capabilities of GD lib...
         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 @@ if test "$with_gd" != "no" && test "$ac_cv_lib_gd_gdImageLine" = "yes"; then
         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 @@ if test "$with_gd" != "no" && test "$ac_cv_lib_gd_gdImageLine" = "yes"; then
       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 @@ dnl SuSE 6.x package structure
     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"
diff --git a/ext/gettext/config.m4 b/ext/gettext/config.m4
index 4c8134bbc1..08d7748ff9 100644
--- a/ext/gettext/config.m4
+++ b/ext/gettext/config.m4
@@ -34,8 +34,8 @@ if test "$PHP_GETTEXT" != "no"; then
   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
diff --git a/ext/gmp/config.m4 b/ext/gmp/config.m4
index 4dea939c99..0a0848f397 100644
--- a/ext/gmp/config.m4
+++ b/ext/gmp/config.m4
@@ -18,10 +18,10 @@ if test "$PHP_GMP" != "no"; then
   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
diff --git a/ext/icap/config.m4 b/ext/icap/config.m4
index 2bd3b6a129..829677a3de 100644
--- a/ext/icap/config.m4
+++ b/ext/icap/config.m4
@@ -7,9 +7,9 @@ if test "$PHP_ICAP" != "no"; then
   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
diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4
index 2bf91e395b..a177020515 100644
--- a/ext/iconv/config.m4
+++ b/ext/iconv/config.m4
@@ -23,13 +23,13 @@ if test "$PHP_ICONV" != "no"; then
     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
diff --git a/ext/imap/config.m4 b/ext/imap/config.m4
index e034e29c4f..beefce56be 100644
--- a/ext/imap/config.m4
+++ b/ext/imap/config.m4
@@ -57,7 +57,7 @@ PHP_ARG_WITH(imap,for IMAP support,
       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 @@ PHP_ARG_WITH(imap,for IMAP support,
       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)
diff --git a/ext/informix/config.m4 b/ext/informix/config.m4
index 8dac054331..537dd451be 100644
--- a/ext/informix/config.m4
+++ b/ext/informix/config.m4
@@ -17,16 +17,16 @@ WARNING: You asked for Informix support, but don't have \\\$INFORMIXDIR
       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 @@ WARNING: You specified Informix base install directory that is different
       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 @@ WARNING: You specified Informix base install directory that is different
             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
diff --git a/ext/ingres_ii/config.m4 b/ext/ingres_ii/config.m4
index 294cb2a8a5..dee71706af 100644
--- a/ext/ingres_ii/config.m4
+++ b/ext/ingres_ii/config.m4
@@ -28,9 +28,9 @@ if test "$PHP_INGRES" != "no"; then
     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)
diff --git a/ext/interbase/config.m4 b/ext/interbase/config.m4
index c2acb383b6..f7a4f03a7c 100644
--- a/ext/interbase/config.m4
+++ b/ext/interbase/config.m4
@@ -12,8 +12,8 @@ if test "$PHP_INTERBASE" != "no"; then
     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)
diff --git a/ext/java/config.m4 b/ext/java/config.m4
index 16f0cfeb11..66996ab371 100644
--- a/ext/java/config.m4
+++ b/ext/java/config.m4
@@ -28,8 +28,8 @@ AC_ARG_WITH(java,
     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 @@ AC_ARG_WITH(java,
         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 @@ AC_ARG_WITH(java,
     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)"
diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4
index 93d9f1844b..116baef441 100644
--- a/ext/ldap/config.m4
+++ b/ext/ldap/config.m4
@@ -47,43 +47,43 @@ if test "$PHP_LDAP" != "no"; then
   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 
diff --git a/ext/mcal/config.m4 b/ext/mcal/config.m4
index 5aebe9009c..6a6e6eea85 100644
--- a/ext/mcal/config.m4
+++ b/ext/mcal/config.m4
@@ -8,7 +8,7 @@ if test "$PHP_MCAL" != "no"; then
   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 @@ if test "$PHP_MCAL" != "no"; then
     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)
diff --git a/ext/mcrypt/config.m4 b/ext/mcrypt/config.m4
index 0320785653..58fb050ced 100644
--- a/ext/mcrypt/config.m4
+++ b/ext/mcrypt/config.m4
@@ -17,7 +17,7 @@ if test "$PHP_MCRYPT" != "no"; then
     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 @@ if test "$PHP_MCRYPT" != "no"; then
   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)
diff --git a/ext/mhash/config.m4 b/ext/mhash/config.m4
index 3ad4058983..bd99ebb52f 100644
--- a/ext/mhash/config.m4
+++ b/ext/mhash/config.m4
@@ -16,8 +16,8 @@ if test "$PHP_MHASH" != "no"; then
   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,[ ])
diff --git a/ext/ming/config.m4 b/ext/ming/config.m4
index d8d0ad2937..9b3364bb26 100644
--- a/ext/ming/config.m4
+++ b/ext/ming/config.m4
@@ -15,10 +15,10 @@ if test "$PHP_MING" != "no"; then
     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,[ ])
diff --git a/ext/mnogosearch/config.m4 b/ext/mnogosearch/config.m4
index ceb16e3c45..3d9445d23f 100644
--- a/ext/mnogosearch/config.m4
+++ b/ext/mnogosearch/config.m4
@@ -40,7 +40,7 @@ PHP_ARG_WITH(mnogosearch,for mnoGoSearch support,
 	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,[ ])
     
diff --git a/ext/msql/config.m4 b/ext/msql/config.m4
index 3f35142573..a2b046d404 100644
--- a/ext/msql/config.m4
+++ b/ext/msql/config.m4
@@ -31,8 +31,8 @@ PHP_ARG_WITH(msql,for mSQL support,
       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)
diff --git a/ext/muscat/config.m4 b/ext/muscat/config.m4
index 89e90dd0f3..b9c680d994 100644
--- a/ext/muscat/config.m4
+++ b/ext/muscat/config.m4
@@ -30,6 +30,6 @@ if test "$PHP_MUSCAT" != "no"; then
   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
diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4
index ae536c6c09..587ecba2ef 100644
--- a/ext/mysql/config.m4
+++ b/ext/mysql/config.m4
@@ -51,7 +51,7 @@ if test "$PHP_MYSQL" = "yes"; then
   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 @@ elif test "$PHP_MYSQL" != "no"; then
     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
diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
index d832b52d8b..fcc03f35b9 100644
--- a/ext/oci8/config.m4
+++ b/ext/oci8/config.m4
@@ -43,16 +43,16 @@ if test "$PHP_OCI8" != "no"; then
   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 @@ if test "$PHP_OCI8" != "no"; then
   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!)
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index 1dcb8e5adb..348527f8ef 100644
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -87,16 +87,16 @@ AC_ARG_WITH(adabas,
     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 @@ AC_ARG_WITH(sapdb,
     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 @@ AC_ARG_WITH(iodbc,
     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 @@ AC_ARG_WITH(dbmaker,
         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
 
diff --git a/ext/oracle/config.m4 b/ext/oracle/config.m4
index 1a720108cf..483d9cad37 100644
--- a/ext/oracle/config.m4
+++ b/ext/oracle/config.m4
@@ -43,16 +43,16 @@ if test "$PHP_ORACLE" != "no"; then
   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 @@ if test "$PHP_ORACLE" != "no"; then
   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 @@ if test "$PHP_ORACLE" != "no"; then
 
 	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!)
diff --git a/ext/ovrimos/config.m4 b/ext/ovrimos/config.m4
index 9f8da431fd..f495e14a5f 100644
--- a/ext/ovrimos/config.m4
+++ b/ext/ovrimos/config.m4
@@ -17,11 +17,11 @@ if test "$PHP_OVRIMOS" != "no"; then
     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)
diff --git a/ext/pcre/config.m4 b/ext/pcre/config.m4
index afc6afce84..8ae3113b3c 100644
--- a/ext/pcre/config.m4
+++ b/ext/pcre/config.m4
@@ -50,9 +50,9 @@ if test "$PHP_PCRE_REGEX" != "no"; then
       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
diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4
index afc6afce84..8ae3113b3c 100644
--- a/ext/pcre/config0.m4
+++ b/ext/pcre/config0.m4
@@ -50,9 +50,9 @@ if test "$PHP_PCRE_REGEX" != "no"; then
       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
diff --git a/ext/pdf/config.m4 b/ext/pdf/config.m4
index ff862cbe62..465dc128f0 100644
--- a/ext/pdf/config.m4
+++ b/ext/pdf/config.m4
@@ -20,11 +20,11 @@ PHP_ARG_WITH(pdflib,whether to include PDFlib support,
       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 @@ PHP_ARG_WITH(pdflib,whether to include PDFlib support,
             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 @@ PHP_ARG_WITH(pdflib,whether to include PDFlib support,
           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 @@ PHP_ARG_WITH(pdflib,whether to include PDFlib support,
           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 @@ PHP_ARG_WITH(pdflib,whether to include PDFlib support,
           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 @@ PHP_ARG_WITH(pdflib,whether to include PDFlib support,
         ])
         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
diff --git a/ext/pfpro/config.m4 b/ext/pfpro/config.m4
index 0d23073a7e..3c68048528 100644
--- a/ext/pfpro/config.m4
+++ b/ext/pfpro/config.m4
@@ -34,10 +34,10 @@ if test "$PHP_PFPRO" != "no"; then
 
   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, [ ])
 
diff --git a/ext/pgsql/config.m4 b/ext/pgsql/config.m4
index 3c7c4d19e0..52f3261dc1 100644
--- a/ext/pgsql/config.m4
+++ b/ext/pgsql/config.m4
@@ -9,7 +9,7 @@ PHP_ARG_WITH(pgsql,for PostgreSQL support,
                           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 @@ if test "$PHP_PGSQL" != "no"; then
   
   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
diff --git a/ext/pspell/config.m4 b/ext/pspell/config.m4
index a6c8643896..b1efe640ef 100644
--- a/ext/pspell/config.m4
+++ b/ext/pspell/config.m4
@@ -23,6 +23,6 @@ if test "$PHP_PSPELL" != "no"; then
 
 	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
diff --git a/ext/qtdom/config.m4 b/ext/qtdom/config.m4
index 7377c51d79..d9d97298e2 100644
--- a/ext/qtdom/config.m4
+++ b/ext/qtdom/config.m4
@@ -12,15 +12,15 @@ case "$withval" in
     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
diff --git a/ext/readline/config.m4 b/ext/readline/config.m4
index 20cdde181b..b17ed05552 100644
--- a/ext/readline/config.m4
+++ b/ext/readline/config.m4
@@ -19,16 +19,16 @@ if test "$PHP_READLINE" != "no"; then
   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 "$PHP_LIBEDIT" != "no"; then
   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, [ ])
diff --git a/ext/recode/config.m4 b/ext/recode/config.m4
index 83b0b5b193..d11c86bb53 100644
--- a/ext/recode/config.m4
+++ b/ext/recode/config.m4
@@ -49,12 +49,12 @@ recode_format_table();
 			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])
diff --git a/ext/rpc/java/config.m4 b/ext/rpc/java/config.m4
index 16f0cfeb11..66996ab371 100644
--- a/ext/rpc/java/config.m4
+++ b/ext/rpc/java/config.m4
@@ -28,8 +28,8 @@ AC_ARG_WITH(java,
     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 @@ AC_ARG_WITH(java,
         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 @@ AC_ARG_WITH(java,
     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)"
diff --git a/ext/sablot/config.m4 b/ext/sablot/config.m4
index b50b921773..aa45004725 100644
--- a/ext/sablot/config.m4
+++ b/ext/sablot/config.m4
@@ -25,10 +25,10 @@ if test "$PHP_SABLOT" != "no"; then
     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 @@ if test "$PHP_SABLOT" != "no"; then
   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,[ ])
diff --git a/ext/session/config.m4 b/ext/session/config.m4
index 72c56732e3..ad22cda721 100644
--- a/ext/session/config.m4
+++ b/ext/session/config.m4
@@ -20,8 +20,8 @@ if test "$PHP_MM" != "no"; then
     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
diff --git a/ext/snmp/config.m4 b/ext/snmp/config.m4
index bc45789906..28f0aaa747 100644
--- a/ext/snmp/config.m4
+++ b/ext/snmp/config.m4
@@ -27,8 +27,8 @@ PHP_ARG_WITH(snmp,for SNMP support,
       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 @@ main() { exit(USE_OPENSSL != 1); }
 	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
diff --git a/ext/swf/config.m4 b/ext/swf/config.m4
index 25809a4822..b05221bb60 100644
--- a/ext/swf/config.m4
+++ b/ext/swf/config.m4
@@ -24,10 +24,10 @@ if test "$PHP_SWF" != "no"; then
    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)
diff --git a/ext/sybase/config.m4 b/ext/sybase/config.m4
index 784b546edd..7f497daac2 100644
--- a/ext/sybase/config.m4
+++ b/ext/sybase/config.m4
@@ -13,11 +13,11 @@ if test "$PHP_SYBASE" != "no"; then
     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,[ ])
diff --git a/ext/sybase_ct/config.m4 b/ext/sybase_ct/config.m4
index 24e0042b28..bb640d75c0 100644
--- a/ext/sybase_ct/config.m4
+++ b/ext/sybase_ct/config.m4
@@ -18,23 +18,23 @@ AC_ARG_WITH(sybase-ct,
       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)
diff --git a/ext/vpopmail/config.m4 b/ext/vpopmail/config.m4
index 8d26f5ba42..3870b4270a 100644
--- a/ext/vpopmail/config.m4
+++ b/ext/vpopmail/config.m4
@@ -38,10 +38,10 @@ if test "$PHP_VPOPMAIL" != "no"; then
 
 	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])
diff --git a/ext/xml/config.m4 b/ext/xml/config.m4
index 3f1321ed74..ec85a84d73 100644
--- a/ext/xml/config.m4
+++ b/ext/xml/config.m4
@@ -30,8 +30,8 @@ if test "$PHP_XML" != "no"; then
     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 @@ if test "$PHP_XML" != "no"; then
     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
diff --git a/ext/zlib/config.m4 b/ext/zlib/config.m4
index 5ce1287358..f1509ff19f 100644
--- a/ext/zlib/config.m4
+++ b/ext/zlib/config.m4
@@ -38,9 +38,9 @@ if test "$PHP_ZLIB" != "no"; then
   ])
 
   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
diff --git a/sapi/aolserver/config.m4 b/sapi/aolserver/config.m4
index 98cd27d086..a353b3c4dc 100644
--- a/sapi/aolserver/config.m4
+++ b/sapi/aolserver/config.m4
@@ -20,7 +20,7 @@ if test "$PHP_AOLSERVER" != "no"; then
     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
diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4
index cd20324501..8030f2c8ee 100644
--- a/sapi/apache/config.m4
+++ b/sapi/apache/config.m4
@@ -24,7 +24,7 @@ AC_ARG_WITH(apxs,
                   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 @@ AC_ARG_WITH(apxs,
 		-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 @@ AC_ARG_WITH(apache,
 	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
diff --git a/sapi/apache2filter/config.m4 b/sapi/apache2filter/config.m4
index fe81e2e9a5..bc2e82f532 100644
--- a/sapi/apache2filter/config.m4
+++ b/sapi/apache2filter/config.m4
@@ -14,7 +14,7 @@ AC_ARG_WITH(apxs2,
                   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 @@ AC_ARG_WITH(apxs2,
 
 	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
diff --git a/sapi/caudium/config.m4 b/sapi/caudium/config.m4
index 209c7cdaad..ba210cc354 100644
--- a/sapi/caudium/config.m4
+++ b/sapi/caudium/config.m4
@@ -37,7 +37,7 @@ AC_ARG_WITH(caudium,
 		   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 @@ AC_ARG_WITH(caudium,
                       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
diff --git a/sapi/fastcgi/config.m4 b/sapi/fastcgi/config.m4
index 7e9c39e0b5..7c44217a69 100644
--- a/sapi/fastcgi/config.m4
+++ b/sapi/fastcgi/config.m4
@@ -10,7 +10,7 @@ AC_ARG_WITH(fastcgi,
   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"
diff --git a/sapi/isapi/config.m4 b/sapi/isapi/config.m4
index 343a7ac7f7..f40bd2c651 100644
--- a/sapi/isapi/config.m4
+++ b/sapi/isapi/config.m4
@@ -13,7 +13,7 @@ AC_ARG_WITH(isapi,
 	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/"
diff --git a/sapi/nsapi/config.m4 b/sapi/nsapi/config.m4
index bf3c3007d1..a550914203 100644
--- a/sapi/nsapi/config.m4
+++ b/sapi/nsapi/config.m4
@@ -23,7 +23,7 @@ if test "$PHP_NSAPI" != "no"; then
   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
diff --git a/sapi/phttpd/config.m4 b/sapi/phttpd/config.m4
index 10460b84e0..516ec6b433 100644
--- a/sapi/phttpd/config.m4
+++ b/sapi/phttpd/config.m4
@@ -10,7 +10,7 @@ AC_ARG_WITH(phttpd,
 	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
diff --git a/sapi/pi3web/config.m4 b/sapi/pi3web/config.m4
index 8203fbaa44..8e04e5952e 100644
--- a/sapi/pi3web/config.m4
+++ b/sapi/pi3web/config.m4
@@ -10,10 +10,10 @@ if test "$PHP_PI3WEB" != "no"; then
 	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/"
diff --git a/sapi/roxen/config.m4 b/sapi/roxen/config.m4
index 2347c005e2..eb7ecd4e21 100644
--- a/sapi/roxen/config.m4
+++ b/sapi/roxen/config.m4
@@ -26,7 +26,7 @@ AC_ARG_WITH(roxen,
 		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
diff --git a/sapi/thttpd/config.m4 b/sapi/thttpd/config.m4
index d125b8768e..f8242f72d5 100644
--- a/sapi/thttpd/config.m4
+++ b/sapi/thttpd/config.m4
@@ -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 @@ AC_ARG_WITH(thttpd,
     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
 ],[