Introduce AC_ADD_* macros

The use of AC_EXPAND_PATH makes it possible to continue
to use relative paths when configuring PHP.
(e.g. --with-apache=../apache-1.3.x works again)

7 files changed, 23 insertions, 32 deletions

diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4
index d966fb8d8a..8e87299d8a 100644
--- a/ext/ldap/config.m4
+++ b/ext/ldap/config.m4
@@ -35,36 +35,33 @@ dnl I have tested Solaris, and it doesn't, but others may.  Add
 dnl these here if necessary.   -RL
 
 	if test `uname` = "Linux"; then
-		LDAP_PTHREAD="-lpthread"
+		LDAP_PTHREAD="pthread"
 	else
 		LDAP_PTHREAD=
 	fi
 
 	if test -f $LDAP_LIBDIR/liblber.a; then
 		LDAP_LIBS="-lldap -llber"
+        AC_ADD_LIBRARY(ldap)
+        AC_ADD_LIBRARY(lber)
 	elif test -f $LDAP_LIBDIR/libldapssl30.so; then
-		LDAP_LIBS="-lldapssl30 $LDAP_PTHREAD"
+        AC_ADD_LIBRARY(ldapssl30)
+        AC_ADD_LIBRARY($LDAP_PTHREAD)
 		AC_DEFINE(HAVE_NSLDAP)
 	elif test -f $LDAP_LIBDIR/libldapssl30.sl; then
-		LDAP_LIBS="-lldapssl30"
+        AC_ADD_LIBRARY(ldapssl30)
 		AC_DEFINE(HAVE_NSLDAP)
 	elif test -f $LDAP_LIBDIR/libldap30.so; then
-		LDAP_LIBS="-lldap30 $LDAP_PTHREAD"
+        AC_ADD_LIBRARY(ldap30)
+        AC_ADD_LIBRARY($LDAP_PTHREAD)
 		AC_DEFINE(HAVE_NSLDAP)
 	elif test -f $LDAP_LIBDIR/libldap30.sl; then
-		LDAP_LIBS="-lldap30"
+        AC_ADD_LIBRARY(ldap30)
 		AC_DEFINE(HAVE_NSLDAP)
 	fi  
 
-	LDAP_INCLUDE=-I$LDAP_INCDIR
-	if test -n "$APXS"; then
-	    LDAP_LFLAGS="-L$LDAP_LIBDIR ${apxs_runpath_switch}$LDAP_LIBDIR'"
-	else
-	    LDAP_LFLAGS="-L$LDAP_LIBDIR ${ld_runpath_switch}$LDAP_LIBDIR"
-	fi
-
-	INCLUDES="$INCLUDES $LDAP_INCLUDE"
-	EXTRA_LIBS="$EXTRA_LIBS $LDAP_LFLAGS $LDAP_LIBS"
+    AC_ADD_INCLUDE($LDAP_INCDIR)
+    AC_ADD_LIBPATH($LDAP_LIBDIR)
 
     AC_DEFINE(HAVE_LDAP)
 
diff --git a/ext/mcrypt/config.m4 b/ext/mcrypt/config.m4
index 1b20490d89..530e118a04 100644
--- a/ext/mcrypt/config.m4
+++ b/ext/mcrypt/config.m4
@@ -16,8 +16,8 @@ AC_ARG_WITH(mcrypt,
     if test "$MCRYPT_DIR" = ""; then
       AC_MSG_ERROR(Please reinstall libmcrypt - I cannot find mcrypt.h)
     fi
-    INCLUDES="$INCLUDES -I$MCRYPT_DIR/include"
-    EXTRA_LIBS="$EXTRA_LIBS -L$MCRYPT_DIR/lib -lmcrypt"
+    AC_ADD_INCLUDE($MCRYPT_DIR/include)
+    AC_ADD_LIBRARY_WITH_PATH(mcrypt, $MCRYPT_DIR/lib)
 
     AC_DEFINE(HAVE_LIBMCRYPT)
 
diff --git a/ext/mhash/config.m4 b/ext/mhash/config.m4
index 5a19821462..92c03d4abd 100644
--- a/ext/mhash/config.m4
+++ b/ext/mhash/config.m4
@@ -16,8 +16,8 @@ AC_ARG_WITH(mhash,
     if test "$MHASH_DIR" = ""; then
       AC_MSG_ERROR(Please reinstall libmhash - I cannot find mhash.h)
     fi
-    INCLUDES="$INCLUDES -I$MHASH_DIR/include"
-    EXTRA_LIBS="$EXTRA_LIBS -L$MHASH_DIR/lib -lmhash"
+    AC_ADD_INCLUDE($MHASH_DIR/include)
+    AC_ADD_LIBRARY_WITH_PATH(mhash, $MHASH_DIR/lib)
 
     AC_DEFINE(HAVE_LIBMHASH)
 
diff --git a/ext/msql/config.m4 b/ext/msql/config.m4
index 4d88952aa1..f2087ea05b 100644
--- a/ext/msql/config.m4
+++ b/ext/msql/config.m4
@@ -32,9 +32,8 @@ AC_ARG_WITH(msql,
       MSQL_INCDIR=$withval/include
       MSQL_LIBDIR=$withval/lib
     fi
-    MSQL_INCLUDE=-I$MSQL_INCDIR
-    MSQL_LFLAGS=-L$MSQL_LIBDIR
-    MSQL_LIBS=-lmsql
+    AC_ADD_LIBRARY_WITH_PATH(msql, $MSQL_LIBDIR)
+    AC_ADD_INCLUDE($MSQL_INCDIR)
     AC_DEFINE(HAVE_MSQL)
     AC_MSG_RESULT(yes)
     PHP_EXTENSION(msql)
@@ -45,5 +44,3 @@ AC_ARG_WITH(msql,
 ],[
   AC_MSG_RESULT(no)
 ])
-EXTRA_LIBS="$EXTRA_LIBS $MSQL_LFLAGS $MSQL_LIBS"
-INCLUDES="$INCLUDES $MSQL_INCLUDE"
diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4
index 4a20d50957..999677eab4 100644
--- a/ext/mysql/config.m4
+++ b/ext/mysql/config.m4
@@ -50,8 +50,8 @@ AC_ARG_WITH(mysql,
 		AC_DEFINE(HAVE_MYSQL)
 		AC_MSG_RESULT(yes)
 
-		EXTRA_LIBS="$EXTRA_LIBS $MYSQL_LFLAGS $MYSQL_LIBS"
-		INCLUDES="$INCLUDES $MYSQL_INCLUDE"
+		AC_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_LIBDIR)
+        AC_ADD_INCLUDE($MYSQL_INCDIR)
 		PHP_EXTENSION(mysql)
 
 		dnl check for errmsg.h, which isn't installed by some versions of 3.21
diff --git a/ext/pgsql/config.m4 b/ext/pgsql/config.m4
index 22aa33ceb6..bd83c2794e 100644
--- a/ext/pgsql/config.m4
+++ b/ext/pgsql/config.m4
@@ -18,6 +18,8 @@ AC_ARG_WITH(pgsql,
     PGSQL_INCLUDE=-I$PGSQL_INCDIR
     PGSQL_LFLAGS=-L$PGSQL_LIBDIR
     PGSQL_LIBS=-lpq
+    AC_ADD_LIBRARY_WITH_PATH(pq, $PGSQL_LIBDIR)
+    AC_ADD_INCLUDE($PGSQL_INCDIR)
 
     old_CFLAGS=$CFLAGS; old_LDFLAGS=$LDFLAGS; old_LIBS=$LIBS
     CFLAGS="$CFLAGS $PGSQL_INCLUDE"
@@ -28,8 +30,6 @@ AC_ARG_WITH(pgsql,
     AC_CHECK_FUNC(PQcmdTuples,AC_DEFINE(HAVE_PQCMDTUPLES))
     CFLAGS=$old_CFLAGS; LDFLAGS=$old_LDFLAGS; LIBS=$old_LIBS
     PHP_EXTENSION(pgsql)
-    EXTRA_LIBS="$EXTRA_LIBS $PGSQL_LFLAGS $PGSQL_LIBS"
-    INCLUDES="$INCLUDES $PGSQL_INCLUDE"
   else
     AC_MSG_RESULT(no)
   fi
diff --git a/ext/snmp/config.m4 b/ext/snmp/config.m4
index e7a5fab7f5..07473fd9c8 100644
--- a/ext/snmp/config.m4
+++ b/ext/snmp/config.m4
@@ -18,14 +18,11 @@ AC_ARG_WITH(snmp,
       test -d $withval/include/ucd-snmp && SNMP_INCDIR=$withval/include/ucd-snmp
       SNMP_LIBDIR=$withval/lib
     fi
-    SNMP_INCLUDE=-I$SNMP_INCDIR
-    SNMP_LFLAGS=-L$SNMP_LIBDIR
-    SNMP_LIBS="-lsnmp"
     AC_DEFINE(HAVE_SNMP)
     AC_MSG_RESULT(yes)
     PHP_EXTENSION(snmp)
-    EXTRA_LIBS="$EXTRA_LIBS $SNMP_LFLAGS $SNMP_LIBS"
-    INCLUDES="$INCLUDES $SNMP_INCLUDE"
+    AC_ADD_LIBRARY_WITH_PATH(snmp, $SNMP_LIBDIR)
+    AC_ADD_INCLUDE($SNMP_INCDIR)
   else
     AC_MSG_RESULT(no)
   fi