cvs: /php4 acinclude.m4 configure.in
| From: | Sascha Schumann | Date: | Sun, 05 Dec 1999 16:24:51 +0000 |
| Subject: | cvs: /php4 acinclude.m4 configure.in | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-7444@lists.php.net to get a copy of this message | ||
sas Sun Dec 5 11:24:51 1999 EDT
Modified files:
/php4 acinclude.m4 configure.in
Log:
Prepend added libraries and separate LDFLAGS handling
Index: php4/acinclude.m4
diff -u php4/acinclude.m4:1.47 php4/acinclude.m4:1.48
--- php4/acinclude.m4:1.47 Sat Dec 4 13:03:00 1999
+++ php4/acinclude.m4 Sun Dec 5 11:24:20 1999
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.47 1999/12/04 18:03:00 sas Exp $
+dnl $Id: acinclude.m4,v 1.48 1999/12/05 16:24:20 sas Exp $
dnl
dnl This file contains local autoconf functions.
@@ -78,7 +78,7 @@
if test "$1" != "/usr/lib"; then
AC_EXPAND_PATH($1, ai_p)
AC_PHP_ONCE(LIBPATH, $ai_p, [
- LIBS="$LIBS -L$ai_p"
+ LDFLAGS="$LDFLAGS -L$ai_p"
PHP_RPATHS="$PHP_RPATHS $ai_p"
])
fi
@@ -121,7 +121,7 @@
dnl
AC_DEFUN(AC_ADD_LIBRARY,[
AC_PHP_ONCE(LIBRARY, $1, [
- LIBS="$LIBS -l$1"
+ LIBS="-l$1 $LIBS"
])
])
Index: php4/configure.in
diff -u php4/configure.in:1.58 php4/configure.in:1.59
--- php4/configure.in:1.58 Sat Dec 4 14:56:08 1999
+++ php4/configure.in Sun Dec 5 11:24:20 1999
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.58 1999/12/04 19:56:08 sas Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.59 1999/12/05 16:24:20 sas Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(0)
@@ -737,8 +737,10 @@
phptempdir="
pwd/libs"
AC_SUBST(phplibdir)
AC_SUBST(phptempdir)
-EXTRA_LIBS="$LIBS $EXTRA_LIBS"
+EXTRA_LIBS="$EXTRA_LIBS $LIBS"
LIBS=""
+EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LDFLAGS"
+LDFLAGS=""
AC_SUBST(CFLAGS)
AC_SUBST(PROG_SENDMAIL)