diff options
| -rw-r--r-- | acinclude.m4 | 11 | ||||
| -rw-r--r-- | configure.in | 3 |
2 files changed, 13 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 99cc1284bf..39dc32866b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -4,6 +4,17 @@ 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" diff --git a/configure.in b/configure.in index 0de6901fa5..a746a801a4 100644 --- a/configure.in +++ b/configure.in @@ -796,6 +796,8 @@ AC_SUBST(EXPANDED_PHP_CONFIG_FILE_PATH) 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 @@ PHP_OS=`uname` AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output]) - PHP_SUBST_OLD(abs_builddir) PHP_SUBST_OLD(abs_srcdir) PHP_SUBST(bindir) |