Skip to content

Commit 9417570

Browse files
author
Sascha Schumann
committed
Prepend added libraries and separate LDFLAGS handling
1 parent 70df2d7 commit 9417570

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

acinclude.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ AC_DEFUN(AC_ADD_LIBPATH,[
7878
if test "$1" != "/usr/lib"; then
7979
AC_EXPAND_PATH($1, ai_p)
8080
AC_PHP_ONCE(LIBPATH, $ai_p, [
81-
LIBS="$LIBS -L$ai_p"
81+
LDFLAGS="$LDFLAGS -L$ai_p"
8282
PHP_RPATHS="$PHP_RPATHS $ai_p"
8383
])
8484
fi
@@ -121,7 +121,7 @@ dnl add a library to the link line
121121
dnl
122122
AC_DEFUN(AC_ADD_LIBRARY,[
123123
AC_PHP_ONCE(LIBRARY, $1, [
124-
LIBS="$LIBS -l$1"
124+
LIBS="-l$1 $LIBS"
125125
])
126126
])
127127

configure.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -737,8 +737,10 @@ phplibdir="`pwd`/modules"
737737
phptempdir="`pwd`/libs"
738738
AC_SUBST(phplibdir)
739739
AC_SUBST(phptempdir)
740-
EXTRA_LIBS="$LIBS $EXTRA_LIBS"
740+
EXTRA_LIBS="$EXTRA_LIBS $LIBS"
741741
LIBS=""
742+
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LDFLAGS"
743+
LDFLAGS=""
742744
743745
AC_SUBST(CFLAGS)
744746
AC_SUBST(PROG_SENDMAIL)

0 commit comments

Comments
 (0)