cvs: /php4/ext/informix Makefile.am config.m4
| From: | Sascha Schumann | Date: | Sun, 10 Oct 1999 17:12:53 +0000 |
| Subject: | cvs: /php4/ext/informix Makefile.am config.m4 | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-5450@lists.php.net to get a copy of this message | ||
sas Sun Oct 10 13:12:53 1999 EDT
Modified files:
/php4/ext/informix Makefile.am config.m4
Log:
Workaround for Informix set of libraries. One library depends on
another "library" (an object file). We build a standard library
out of this object here, so that we can link it in at the right place
later.
Index: php4/ext/informix/Makefile.am
diff -u php4/ext/informix/Makefile.am:1.5 php4/ext/informix/Makefile.am:1.6
--- php4/ext/informix/Makefile.am:1.5 Sun Oct 10 08:10:40 1999
+++ php4/ext/informix/Makefile.am Sun Oct 10 13:12:22 1999
@@ -1,7 +1,10 @@
-# $Id: Makefile.am,v 1.5 1999/10/10 12:10:40 sas Exp $
+# $Id: Makefile.am,v 1.6 1999/10/10 17:12:22 sas Exp $
INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_informix.la
+noinst_LIBRARIES=libifx.a
+libifx_a_SOURCES=stub.c
+libifx_a_LIBADD=@IFX_OBJS@
libphpext_informix_la_SOURCES=ifx.c
libphpext_informix_la_LIBADD=@IFX_LIBS@
Index: php4/ext/informix/config.m4
diff -u php4/ext/informix/config.m4:1.2 php4/ext/informix/config.m4:1.3
--- php4/ext/informix/config.m4:1.2 Sun Oct 10 08:10:40 1999
+++ php4/ext/informix/config.m4 Sun Oct 10 13:12:22 1999
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.2 1999/10/10 12:10:40 sas Exp $
+dnl $Id: config.m4,v 1.3 1999/10/10 17:12:22 sas Exp $
divert(3)
@@ -60,7 +60,16 @@
AC_DEFINE_UNQUOTED(IFX_VERSION, $IFX_VERSION)
AC_MSG_RESULT(yes)
PHP_EXTENSION(informix)
- IFX_LIBS="$IFX_LFLAGS $IFX_LIBS"
+ for i in $IFX_LIBS; do
+ case "$i" in
+ *.o)
+ IFX_OBJS="$IFX_OBJS $i"
+ IFX_LIBADD="$IFX_LIBADD -Lext/informix -lifx";;
+ *)
+ IFX_LIBADD="$IFX_LIBADD $i";;
+ esac
+ done
+ IFX_LIBS="$IFX_LFLAGS $IFX_LIBADD"
INCLUDES="$INCLUDES $IFX_INCLUDE"
fi
else
@@ -72,6 +81,7 @@
])
AC_SUBST(INFORMIXDIR)
AC_SUBST(IFX_LIBS)
+AC_SUBST(IFX_OBJS)
divert(5)