Renamed the AC_ prefixed macros defined in acinclude.m4 to PHP_* prefixes.

# Heads up people! I tested this before committing but you never know..

11 files changed, 19 insertions, 19 deletions

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
 ],[