cvs: php4 / acinclude.m4 configure.in

hholzgra Thu Jan 3 15:30:08 2002 EDT Modified files: /php4 configure.in acinclude.m4 Log: make configure more robust if extensions add libraries without checking for their existance first old behaviour was to fail on the next library check with misleading messages, now configure will work but make will fail with a 'lib not found' message Index: php4/configure.in diff -u php4/configure.in:1.283 php4/configure.in:1.284 --- php4/configure.in:1.283 Sun Dec 9 20:44:17 2001 +++ php4/configure.in Thu Jan 3 15:30:07 2002 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.283 2001/12/10 01:44:17 sniper Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.284 2002/01/03 20:30:07 hholzgra Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -727,7 +727,7 @@ INCLUDES="$INCLUDES -I\$(top_srcdir)/TSRM" fi -EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS" +EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS $PHP_EXTENSION_LIBS" unset LIBS LDFLAGS PHP_CONFIGURE_PART(Configuring TSRM) Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.144 php4/acinclude.m4:1.145 --- php4/acinclude.m4:1.144 Sun Dec 30 10:39:01 2001 +++ php4/acinclude.m4 Thu Jan 3 15:30:07 2002 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.144 2001/12/30 15:39:01 alexwaugh Exp $ +dnl $Id: acinclude.m4,v 1.145 2002/01/03 20:30:07 hholzgra Exp $ dnl dnl This file contains local autoconf functions. @@ -749,7 +749,7 @@ c|c_r|pthread*) ;; *) ifelse($3,,[ - PHP_X_ADD_LIBRARY($1,$2,LIBS) + PHP_X_ADD_LIBRARY($1,$2,PHP_EXTENSION_LIBS) ],[ if test "$ext_shared" = "yes"; then PHP_X_ADD_LIBRARY($1,$2,$3)