Reverted Hartmut's patch as it caused more trouble than it solved.

# Broke my build totally. The 'correct' fix is to make the checks better
# everywhere. ie. to check for existance of the library/symbol in some lib.

diff --git a/acinclude.m4 b/acinclude.m4
index 014478e5cb2cf93c318e09439097ef7b4310dd4b..986a10dc74a52a2b101ded581511834b34881499 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -749,7 +749,7 @@ AC_DEFUN(PHP_ADD_LIBRARY,[
  c|c_r|pthread*) ;;
  *)
 ifelse($3,,[
-   PHP_X_ADD_LIBRARY($1,$2,PHP_EXTENSION_LIBS)
+   PHP_X_ADD_LIBRARY($1,$2,LIBS)
 ],[
    if test "$ext_shared" = "yes"; then
      PHP_X_ADD_LIBRARY($1,$2,$3)

diff --git a/configure.in b/configure.in
index 9bb88cf2dc7b1ed1a838fbe0a25bef2d17eb3d28..fa77e0ba996ba77479cb536c69c3c70bdc9cbe21 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -242,7 +242,7 @@ AC_CHECK_LIB(nsl, gethostname, [
 
 fi
 
-AC_CHECK_LIB(dl, dlopen,[LIBS="-ldl $LIBS"])
+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
@@ -736,7 +736,7 @@ if test "$abs_srcdir" != "$abs_builddir"; then
   INCLUDES="$INCLUDES -I\$(top_srcdir)/TSRM"
 fi
 
-EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS $PHP_EXTENSION_LIBS"
+EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS"
 unset LIBS LDFLAGS
 
 PHP_CONFIGURE_PART(Configuring TSRM)