cvs: /php4/ext/informix Makefile.am config.m4
| From: | Sascha Schumann | Date: | Sun, 05 Dec 1999 23:11:37 +0000 |
| Subject: | cvs: /php4/ext/informix Makefile.am config.m4 | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-7479@lists.php.net to get a copy of this message | ||
sas Sun Dec 5 18:11:37 1999 EDT
Modified files:
/php4/ext/informix Makefile.am config.m4
Log:
Create helper library during configure time
Index: php4/ext/informix/Makefile.am
diff -u php4/ext/informix/Makefile.am:1.8 php4/ext/informix/Makefile.am:1.9
--- php4/ext/informix/Makefile.am:1.8 Sat Nov 27 17:04:25 1999
+++ php4/ext/informix/Makefile.am Sun Dec 5 18:11:37 1999
@@ -1,9 +1,6 @@
-# $Id: Makefile.am,v 1.8 1999/11/27 22:04:25 sas Exp $
+# $Id: Makefile.am,v 1.9 1999/12/05 23:11:37 sas Exp $
noinst_LTLIBRARIES=libphpext_informix.la
-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@
Index: php4/ext/informix/config.m4
diff -u php4/ext/informix/config.m4:1.8 php4/ext/informix/config.m4:1.9
--- php4/ext/informix/config.m4:1.8 Sun Dec 5 17:19:12 1999
+++ php4/ext/informix/config.m4 Sun Dec 5 18:11:37 1999
@@ -1,7 +1,9 @@
-dnl $Id: config.m4,v 1.8 1999/12/05 22:19:12 evan Exp $
+dnl $Id: config.m4,v 1.9 1999/12/05 23:11:37 sas Exp $
divert(3)
+PHPIFXLIB=ext/informix/libphp_ifx.a
+
AC_MSG_CHECKING(for Informix support)
AC_ARG_WITH(informix,
[ --with-informix[=DIR] Include Informix support. DIR is the Informix base
@@ -73,11 +75,16 @@
for i in $IFX_LIBS; do
case "$i" in
*.o)
- IFX_OBJS="$IFX_OBJS $i"
- AC_ADD_LIBRARY_WITH_PATH(php_ifx, $abs_builddir/ext/informix);;
+ AC_ADD_LIBPATH($abs_builddir/ext/informix)
+ AC_ADD_LIBRARY(php_ifx, 1)
+ test -d ext/informix || mkdir ext ext/informix
+ cd ext/informix
+ ar r libphp_ifx.a $i
+ ranlib libphp_ifx.a
+ cd ../..;;
-l*)
lib=
echo $i|sed 's/^-l//'
- AC_ADD_LIBRARY($lib);;
+ AC_ADD_LIBRARY($lib, 1);;
*)
IFX_LIBADD="$IFX_LIBADD $i";;
esac
@@ -94,7 +101,6 @@
])
AC_SUBST(INFORMIXDIR)
AC_SUBST(IFX_LIBS)
-AC_SUBST(IFX_OBJS)
divert(5)