cvs: php4 / acinclude.m4 configure.in
| From: | Sascha Schumann | Date: | Wed, 09 May 2001 13:57:57 +0000 |
| Subject: | cvs: php4 / acinclude.m4 configure.in | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-5614@lists.php.net to get a copy of this message | ||
sas Wed May 9 06:57:57 2001 EDT
Modified files:
/php4 acinclude.m4 configure.in
Log:
Remove -L/usr/lib/? from PHP_LDFLAGS.
Index: php4/acinclude.m4
diff -u php4/acinclude.m4:1.122 php4/acinclude.m4:1.123
--- php4/acinclude.m4:1.122 Tue Mar 27 12:34:20 2001
+++ php4/acinclude.m4 Wed May 9 06:57:56 2001
@@ -1,9 +1,20 @@
-dnl $Id: acinclude.m4,v 1.122 2001/03/27 20:34:20 sniper Exp $
+dnl $Id: acinclude.m4,v 1.123 2001/05/09 13:57:56 sas Exp $
dnl
dnl This file contains local autoconf functions.
sinclude(dynlib.m4)
+AC_DEFUN(PHP_REMOVE_USR_LIB,[
+ ac_new_flags=""
+ for i in [$]$1; do
+ case [$]i in
+ -L/usr/lib|-L/usr/lib/) ;;
+ *) ac_new_flags="[$]ac_new_flags [$]i" ;;
+ esac
+ done
+ $1=[$]ac_new_flags
+])
+
AC_DEFUN(PHP_SETUP_OPENSSL,[
if test "$PHP_OPENSSL" = "no"; then
PHP_OPENSSL="/usr/local/ssl /usr/local /usr /usr/local/openssl"
Index: php4/configure.in
diff -u php4/configure.in:1.241 php4/configure.in:1.242
--- php4/configure.in:1.241 Tue May 8 13:11:46 2001
+++ php4/configure.in Wed May 9 06:57:56 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.241 2001/05/08 20:11:46 sniper Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.242 2001/05/09 13:57:56 sas Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -796,6 +796,8 @@
PHP_BUILD_RPATH
+PHP_REMOVE_USR_LIB(PHP_LDFLAGS)
+
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS"
PHP_BUILD_DATE=
date '+%Y-%m-%d'
@@ -806,7 +808,6 @@
AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output])
-
PHP_SUBST_OLD(abs_builddir)
PHP_SUBST_OLD(abs_srcdir)
PHP_SUBST(bindir)