cvs: /php4 configure.in acinclude.m4

sas Tue Feb 29 05:02:59 2000 EDT Modified files: /php4 configure.in acinclude.m4 Log: AD_ADD_LIBRARY_DEFER allows people to add libraries in a deferred way (needed for imap and recode) Index: php4/configure.in diff -u php4/configure.in:1.95 php4/configure.in:1.96 --- php4/configure.in:1.95 Fri Feb 25 19:20:47 2000 +++ php4/configure.in Tue Feb 29 05:02:29 2000 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.95 2000/02/26 03:20:47 zeev Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.96 2000/02/29 13:02:29 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -674,7 +674,7 @@ dnl add -fPIC option on Solaris if we are building dynamic extensions dnl PHP_SOLARIS_PIC_WEIRDNESS -EXTRA_LIBS="$EXTRA_LIBS $LIBS" +EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS" LIBS="" LDFLAGS="" if test "$PHP_THREAD_SAFETY" = "yes"; then Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.62 php4/acinclude.m4:1.63 --- php4/acinclude.m4:1.62 Sat Feb 12 07:13:44 2000 +++ php4/acinclude.m4 Tue Feb 29 05:02:29 2000 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.62 2000/02/12 15:13:44 sas Exp $ +dnl $Id: acinclude.m4,v 1.63 2000/02/29 13:02:29 sas Exp $ dnl dnl This file contains local autoconf functions. @@ -248,6 +248,16 @@ ]) dnl +dnl AC_ADD_LIBRARY_DEFER(library[, append]) +dnl +dnl add a library to the link line (defferred) +AC_DEFUN(AC_ADD_LIBRARY_DEFER,[ + AC_PHP_ONCE(LIBRARY, $1, [ + ifelse($#, 1, DLIBS="-l$1 $DLIBS", DLIBS="$DLIBS -l$1") + ]) +]) + +dnl dnl AC_ADD_LIBRARY_WITH_PATH(library, path) dnl dnl add a library to the link line and path to linkpath/runpath @@ -359,7 +369,7 @@ EXT_LIBS="$EXT_LIBS $1/$_extlib" EXT_STATIC="$EXT_STATIC $1" else - AC_DEFINE_UNQUOTED([COMPILE_DL_]translit($1,a-z,A-Z), 1, Whether to build $1 as dynamic module) + AC_DEFINE_UNQUOTED([COMPILE_DL_]translit($1,a-z-,A-Z_), 1, Whether to build $1 as dynamic module) EXT_SHARED="$EXT_SHARED $1" fi PHP_FAST_OUTPUT(ext/$1/Makefile)