Skip to content

Commit d1820e4

Browse files
author
Sascha Schumann
committed
Use LIBS instead of EXTRA_LIBS, so that inter-library dependences can
be tested for using standard autoconf macros.
1 parent b1eb785 commit d1820e4

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
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-
EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
81+
LIBS="$LIBS -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-
EXTRA_LIBS="$EXTRA_LIBS -l$1"
124+
LIBS="$LIBS -l$1"
125125
])
126126
])
127127

configure.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ dnl as well as res_search resides in libsocket
186186
AC_CHECK_LIB(m, sin)
187187

188188
AC_CHECK_LIB(bind, inet_aton, [
189-
EXTRA_LIBS="$EXTRA_LIBS -lbind"
189+
AC_ADD_LIBRARY(bind)
190190
AC_DEFINE(HAVE_LIBBIND) ], [])
191191

192192
AC_CHECK_LIB(resolv, inet_aton)
@@ -729,7 +729,7 @@ phplibdir="`pwd`/modules"
729729
phptempdir="`pwd`/libs"
730730
AC_SUBST(phplibdir)
731731
AC_SUBST(phptempdir)
732-
EXTRA_LIBS="$LIBS $EXTRA_LIBS"
732+
EXTRA_LIBS="$LIBS"
733733
LIBS=""
734734
735735
AC_SUBST(CFLAGS)

0 commit comments

Comments
 (0)