cvs: php4 / acinclude.m4 configure.in

sniper Tue Jan 8 22:40:51 2002 EDT Modified files: /php4 acinclude.m4 configure.in Log: Reverted Hartmut's patch as it caused more trouble than it solved. # Broke my build totally. The 'correct' fix is to make the checks better # everywhere. ie. to check for existance of the library/symbol in some lib. Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.146 php4/acinclude.m4:1.147 --- php4/acinclude.m4:1.146 Fri Jan 4 07:26:27 2002 +++ php4/acinclude.m4 Tue Jan 8 22:40:51 2002 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.146 2002/01/04 12:26:27 hholzgra Exp $ +dnl $Id: acinclude.m4,v 1.147 2002/01/09 03:40:51 sniper 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,PHP_EXTENSION_LIBS) + PHP_X_ADD_LIBRARY($1,$2,LIBS) ],[ if test "$ext_shared" = "yes"; then PHP_X_ADD_LIBRARY($1,$2,$3) Index: php4/configure.in diff -u php4/configure.in:1.286 php4/configure.in:1.287 --- php4/configure.in:1.286 Sun Jan 6 06:54:18 2002 +++ php4/configure.in Tue Jan 8 22:40:51 2002 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.286 2002/01/06 11:54:18 venaas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.287 2002/01/09 03:40:51 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -242,7 +242,7 @@ fi -AC_CHECK_LIB(dl, dlopen,[LIBS="-ldl $LIBS"]) +AC_CHECK_LIB(dl, dlopen,[PHP_ADD_LIBRARY(dl)]) dnl The sin may be in a library which need not be specifed dnl as well as res_search resides in libsocket @@ -736,7 +736,7 @@ INCLUDES="$INCLUDES -I\$(top_srcdir)/TSRM" fi -EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS $PHP_EXTENSION_LIBS" +EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS" unset LIBS LDFLAGS PHP_CONFIGURE_PART(Configuring TSRM)