Lift the add-once limit for libraries, because there are valid reasons

against it. When dealing with static libraries, the link order is
important and it might be necessary to add a library multiple times to
satisfy mutual symbol requirements.

diff --git a/acinclude.m4 b/acinclude.m4
index b2e702e53e999a2c88e32d21d21b883add912c3b..c620edce3e18c40e24d5892931e95468e28fd16c 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -547,9 +547,7 @@ AC_DEFUN(AC_ADD_LIBRARY,[
  c|c_r|pthread*) ;;
  *)
 ifelse($3,,[
-   AC_PHP_ONCE(LIBRARY, $1, [
-     PHP_X_ADD_LIBRARY($1,$2,LIBS)
-   ])
+   PHP_X_ADD_LIBRARY($1,$2,LIBS)
 ],[
    if test "$ext_shared" = "yes"; then
      PHP_X_ADD_LIBRARY($1,$2,$3)
@@ -566,9 +564,7 @@ dnl AC_ADD_LIBRARY_DEFER(library[, append])
 dnl
 dnl add a library to the link line (deferred)
 AC_DEFUN(AC_ADD_LIBRARY_DEFER,[
-  AC_PHP_ONCE(LIBRARY, $1, [
-    ifelse($#, 1, DLIBS="-l$1 $DLIBS", DLIBS="$DLIBS -l$1")
-  ])
+  ifelse($#, 1, DLIBS="-l$1 $DLIBS", DLIBS="$DLIBS -l$1")
 ])
 
 dnl