cvs: /php4 acinclude.m4 configure.in

sas Sat Dec 4 13:03:31 1999 EDT Modified files: /php4 acinclude.m4 configure.in Log: Use LIBS instead of EXTRA_LIBS, so that inter-library dependences can be tested for using standard autoconf macros. Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.46 php4/acinclude.m4:1.47 --- php4/acinclude.m4:1.46 Sat Dec 4 09:45:36 1999 +++ php4/acinclude.m4 Sat Dec 4 13:03:00 1999 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.46 1999/12/04 14:45:36 ssb Exp $ +dnl $Id: acinclude.m4,v 1.47 1999/12/04 18:03:00 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, [ - EXTRA_LIBS="$EXTRA_LIBS -L$ai_p" + LIBS="$LIBS -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, [ - EXTRA_LIBS="$EXTRA_LIBS -l$1" + LIBS="$LIBS -l$1" ]) ]) Index: php4/configure.in diff -u php4/configure.in:1.55 php4/configure.in:1.56 --- php4/configure.in:1.55 Sat Dec 4 08:16:03 1999 +++ php4/configure.in Sat Dec 4 13:03:00 1999 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.55 1999/12/04 13:16:03 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.56 1999/12/04 18:03:00 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(0) @@ -186,7 +186,7 @@ AC_CHECK_LIB(m, sin) AC_CHECK_LIB(bind, inet_aton, [ - EXTRA_LIBS="$EXTRA_LIBS -lbind" + AC_ADD_LIBRARY(bind) AC_DEFINE(HAVE_LIBBIND) ], []) AC_CHECK_LIB(resolv, inet_aton) @@ -729,7 +729,7 @@ phptempdir="pwd/libs" AC_SUBST(phplibdir) AC_SUBST(phptempdir) -EXTRA_LIBS="$LIBS $EXTRA_LIBS" +EXTRA_LIBS="$LIBS" LIBS="" AC_SUBST(CFLAGS)