helly Fri Nov 15 16:30:51 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/dba config.m4
Log:
MFH: When --enable-dba is used then include builtin modules unless
--without-xxx is not used.
Index: php4/ext/dba/config.m4
diff -u php4/ext/dba/config.m4:1.29 php4/ext/dba/config.m4:1.29.2.1
--- php4/ext/dba/config.m4:1.29 Wed Nov 13 08:12:26 2002
+++ php4/ext/dba/config.m4 Fri Nov 15 16:30:51 2002
@@ -1,7 +1,9 @@
dnl
-dnl $Id: config.m4,v 1.29 2002/11/13 13:12:26 edink Exp $
+dnl $Id: config.m4,v 1.29.2.1 2002/11/15 21:30:51 helly Exp $
dnl
+dnl Suppose we need FlatFile if no or only CDB is used.
+
AC_DEFUN(PHP_TEMP_LDFLAGS,[
old_LDFLAGS=$LDFLAGS
LDFLAGS="$1 $LDFLAGS"
@@ -9,7 +11,6 @@
LDFLAGS=$old_LDFLAGS
])
-
dnl Assign INCLUDE/LFLAGS from PREFIX
AC_DEFUN(PHP_DBA_STD_ASSIGN,[
if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then
@@ -48,7 +49,7 @@
])
PHP_ARG_ENABLE(dba,whether to enable DBA,
-[ --enable-dba=shared Build DBA as a shared module])
+[ --enable-dba Build DBA with builtin modules])
AC_ARG_WITH(gdbm,
[ --with-gdbm[=DIR] Include GDBM support],[
@@ -211,15 +212,19 @@
AC_MSG_CHECKING(for DBM support)
AC_DBA_STD_RESULT
+AC_DEFUN(PHP_DBA_BUILTIN_CDB,[
+ PHP_ADD_BUILD_DIR($ext_builddir/libcdb)
+ AC_DEFINE(DBA_CDB_BUILTIN, 1, [ ])
+ AC_DEFINE(DBA_CDB_MAKE, 1, [ ])
+ AC_DEFINE(DBA_CDB, 1, [ ])
+ cdb_sources="libcdb/cdb.c libcdb/cdb_make.c libcdb/uint32.c"
+ THIS_RESULT="builtin"
+])
+
AC_ARG_WITH(cdb,
[ --with-cdb[=DIR] Include CDB support],[
- if test "$withval" = "yes"; then
- PHP_ADD_BUILD_DIR($ext_builddir/libcdb)
- AC_DEFINE(DBA_CDB_BUILTIN, 1, [ ])
- AC_DEFINE(DBA_CDB_MAKE, 1, [ ])
- AC_DEFINE(DBA_CDB, 1, [ ])
- cdb_sources="libcdb/cdb.c libcdb/cdb_make.c libcdb/uint32.c"
- THIS_RESULT="builtin"
+ if test "$withval" != "no"; then
+ PHP_DBA_BUILTIN_CDB
elif test "$withval" != "no"; then
for i in /usr/local /usr $withval; do
if test -f "$i/include/cdb.h" ; then
@@ -237,17 +242,32 @@
PHP_DBA_STD_CHECK
PHP_DBA_STD_ATTACH
fi
+],[
+ if test "$PHP_DBA" != "no"; then
+ PHP_DBA_BUILTIN_CDB
+ fi
])
AC_MSG_CHECKING(for CDB support)
AC_DBA_STD_RESULT
+AC_DEFUN(PHP_DBA_BUILTIN_FLATFILE,[
+ PHP_ADD_BUILD_DIR($ext_builddir/libflatfile)
+ AC_DEFINE(DBA_FLATFILE, 1, [ ])
+ flat_sources="dba_flatfile.c libflatfile/flatfile.c"
+ THIS_RESULT="builtin"
+])
+
+dnl
+dnl FlatFile check must be the last one.
+dnl
AC_ARG_WITH(flatfile,
[ --with-flatfile Include FlatFile support],[
if test "$withval" != "no"; then
- PHP_ADD_BUILD_DIR($ext_builddir/libflatfile)
- AC_DEFINE(DBA_FLATFILE, 1, [ ])
- flat_sources="dba_flatfile.c libflatfile/flatfile.c"
- THIS_RESULT="builtin"
+ PHP_DBA_BUILTIN_FLATFILE
+ fi
+],[
+ if test "$PHP_DBA" != "no"; then
+ PHP_DBA_BUILTIN_FLATFILE
fi
])
AC_MSG_CHECKING(for FlatFile support)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
