cvs: php4 / acinclude.m4
| From: | Sascha Schumann | Date: | Mon, 10 Jul 2000 10:26:13 +0000 |
| Subject: | cvs: php4 / acinclude.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-702@lists.php.net to get a copy of this message | ||
sas Mon Jul 10 03:26:13 2000 EDT
Modified files:
/php4 acinclude.m4
Log:
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.
Index: php4/acinclude.m4
diff -u php4/acinclude.m4:1.99 php4/acinclude.m4:1.100
--- php4/acinclude.m4:1.99 Sun Jul 9 13:39:18 2000
+++ php4/acinclude.m4 Mon Jul 10 03:26:13 2000
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.99 2000/07/09 20:39:18 sas Exp $
+dnl $Id: acinclude.m4,v 1.100 2000/07/10 10:26:13 sas Exp $
dnl
dnl This file contains local autoconf functions.
@@ -547,9 +547,7 @@
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
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