cvs: /php4/ext/informix Makefile.am config.m4

sas Sat Nov 27 17:04:56 1999 EDT Modified files: /php4/ext/informix Makefile.am config.m4 Log: Improved build (now sets also runtime library search paths, works out-of-the-box with Apache) Index: php4/ext/informix/Makefile.am diff -u php4/ext/informix/Makefile.am:1.7 php4/ext/informix/Makefile.am:1.8 --- php4/ext/informix/Makefile.am:1.7 Sat Nov 13 07:40:37 1999 +++ php4/ext/informix/Makefile.am Sat Nov 27 17:04:25 1999 @@ -1,17 +1,17 @@ -# $Id: Makefile.am,v 1.7 1999/11/13 12:40:37 sas Exp $ +# $Id: Makefile.am,v 1.8 1999/11/27 22:04:25 sas Exp $ noinst_LTLIBRARIES=libphpext_informix.la -noinst_LIBRARIES=libifx.a -libifx_a_SOURCES=stub.c -libifx_a_LIBADD=@IFX_OBJS@ +noinst_LIBRARIES=libphp_ifx.a +libphp_ifx_a_SOURCES=stub.c +libphp_ifx_a_LIBADD=@IFX_OBJS@ libphpext_informix_la_SOURCES=ifx.c libphpext_informix_la_LIBADD=@IFX_LIBS@ CLEANFILES = ifx.c -ifx.c: ifx.ec +ifx.c: $(srcdir)/ifx.ec (if test -d @INFORMIXDIR@; then \ - esql -e @IFX_ESQL_FLAGS@ ifx.ec; \ + esql -e @IFX_ESQL_FLAGS@ $(srcdir)/ifx.ec; \ else \ touch ifx.c; \ fi) Index: php4/ext/informix/config.m4 diff -u php4/ext/informix/config.m4:1.5 php4/ext/informix/config.m4:1.6 --- php4/ext/informix/config.m4:1.5 Mon Oct 11 12:54:40 1999 +++ php4/ext/informix/config.m4 Sat Nov 27 17:04:25 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.5 1999/10/11 16:54:40 danny Exp $ +dnl $Id: config.m4,v 1.6 1999/11/27 22:04:25 sas Exp $ divert(3) @@ -19,14 +19,16 @@ if test "$withval" = "yes"; then IFX_INCDIR=$INFORMIXDIR/incl/esql if test -z "$IFX_LIBDIR"; then - IFX_LIBDIR="-L$INFORMIXDIR/lib -L$INFORMIXDIR/lib/esql" + AC_ADD_LIBPATH($INFORMIXDIR/lib) + AC_ADD_LIBPATH($INFORMIXDIR/lib/esql) else IFX_LIBDIR="$IFX_LIBDIR" fi else IFX_INCDIR=$withval/incl/esql if test -z "$IFX_LIBDIR"; then - IFX_LIBDIR="-L$withval/lib -L$withval/lib/esql" + AC_ADD_LIBPATH($withval/lib) + AC_ADD_LIBPATH($withval/lib/esql) else IFX_LIBDIR="$IFX_LIBDIR" fi @@ -47,7 +49,7 @@ dnl According to Perls DBD-Informix, might contain these strings. else dnl Allow override to use static and/or threaded libs - IFX_LIBS="$IFX_LIBS" + : fi CFLAGS="$CFLAGS $IFX_INCLUDE" LDFLAGS="$LDFLAGS $IFX_LFLAGS" @@ -72,7 +74,10 @@ case "$i" in *.o) IFX_OBJS="$IFX_OBJS $i" - IFX_LIBADD="$IFX_LIBADD -Lext/informix -lifx";; + AC_ADD_LIBRARY_WITH_PATH(php_ifx, $abs_builddir/ext/informix);; + -l*) + lib=echo $i|sed 's/^-l//' + AC_ADD_LIBRARY($lib);; *) IFX_LIBADD="$IFX_LIBADD $i";; esac