diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/informix/Makefile.am | 10 | ||||
| -rw-r--r-- | ext/informix/config.m4 | 13 |
2 files changed, 14 insertions, 9 deletions
diff --git a/ext/informix/Makefile.am b/ext/informix/Makefile.am index 587f25a2d6..389bb9c203 100644 --- a/ext/informix/Makefile.am +++ b/ext/informix/Makefile.am @@ -1,17 +1,17 @@ # $Id$ 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) diff --git a/ext/informix/config.m4 b/ext/informix/config.m4 index 3dc6857d2a..ca07cdcb9d 100644 --- a/ext/informix/config.m4 +++ b/ext/informix/config.m4 @@ -19,14 +19,16 @@ WARNING: You asked for Informix support, but don't have \\\$INFORMIXDIR 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 @@ WARNING: You specified Informix base install directory that is different 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 @@ WARNING: You specified Informix base install directory that is different 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 |