Use LIBS instead of EXTRA_LIBS, so that inter-library dependences can

be tested for using standard autoconf macros.

diff --git a/acinclude.m4 b/acinclude.m4
index 96b59161e120e29e81c40c7b46166c0fcc06cdc2..6df68e5fdd0134b6e82f1ea08b78ae39b71424a7 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -78,7 +78,7 @@ AC_DEFUN(AC_ADD_LIBPATH,[
   if test "$1" != "/usr/lib"; then
     AC_EXPAND_PATH($1, ai_p)
     AC_PHP_ONCE(LIBPATH, $ai_p, [
-      EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
+      LIBS="$LIBS -L$ai_p"
       PHP_RPATHS="$PHP_RPATHS $ai_p"
     ])
   fi
@@ -121,7 +121,7 @@ dnl add a library to the link line
 dnl
 AC_DEFUN(AC_ADD_LIBRARY,[
   AC_PHP_ONCE(LIBRARY, $1, [
-    EXTRA_LIBS="$EXTRA_LIBS -l$1"
+    LIBS="$LIBS -l$1"
   ])
 ])
 

diff --git a/configure.in b/configure.in
index 632080c3b5fcaa4efb7847fedac108a5abb931dc..cb9bdb730658d070fbf9bd3334de5bd02f0a608a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -186,7 +186,7 @@ dnl as well as res_search resides in libsocket
 AC_CHECK_LIB(m, sin)
 
 AC_CHECK_LIB(bind, inet_aton, [
-  EXTRA_LIBS="$EXTRA_LIBS -lbind"
+  AC_ADD_LIBRARY(bind)
   AC_DEFINE(HAVE_LIBBIND) ], []) 
 
 AC_CHECK_LIB(resolv, inet_aton)
@@ -729,7 +729,7 @@ phplibdir="`pwd`/modules"
 phptempdir="`pwd`/libs"
 AC_SUBST(phplibdir)
 AC_SUBST(phptempdir)
-EXTRA_LIBS="$LIBS $EXTRA_LIBS"
+EXTRA_LIBS="$LIBS"
 LIBS=""
 
 AC_SUBST(CFLAGS)