cvs: php4(PHP_4_3) /ext/dba config.m4
| From: | Marcus Boerger | Date: | Wed, 14 May 2003 06:22:58 +0000 |
| Subject: | cvs: php4(PHP_4_3) /ext/dba config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-20888@lists.php.net to get a copy of this message | ||
helly Wed May 14 02:22:58 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/dba config.m4
Log:
MFH: Enable db<n> builds configured with --with-uniquename
Index: php4/ext/dba/config.m4
diff -u php4/ext/dba/config.m4:1.29.2.16 php4/ext/dba/config.m4:1.29.2.17
--- php4/ext/dba/config.m4:1.29.2.16 Tue May 13 16:39:08 2003
+++ php4/ext/dba/config.m4 Wed May 14 02:22:58 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.29.2.16 2003/05/13 20:39:08 helly Exp $
+dnl $Id: config.m4,v 1.29.2.17 2003/05/14 06:22:58 helly Exp $
dnl
dnl Suppose we need FlatFile if no support or only CDB is used.
@@ -136,8 +136,12 @@
AC_DEFUN(PHP_DBA_DB_CHECK,[
for LIB in $2; do
if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then
- PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[
- AC_CHECK_LIB($LIB, $3, [
+ PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib -l$LIB,[
+ AC_TRY_LINK([
+#include "$THIS_INCLUDE"
+ ],[
+ $3;
+ ],[
AC_EGREP_CPP(yes,[
#include "$THIS_INCLUDE"
#if DB_VERSION_MAJOR == $1
@@ -219,7 +223,7 @@
break
fi
done
- PHP_DBA_DB_CHECK(4, db-4.1 db-4.0 db-4 db4 db, db_create)
+ PHP_DBA_DB_CHECK(4, db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
fi
])
AC_DBA_STD_RESULT(db4,Berkeley DB4)
@@ -254,7 +258,7 @@
break
fi
done
- PHP_DBA_DB_CHECK(3, db-3.3 db-3.2 db-3.1 db-3.0 db-3 db3 db, db_create)
+ PHP_DBA_DB_CHECK(3, db-3.3 db-3.2 db-3.1 db-3.0 db-3 db3 db, [(void)db_create((DB**)0,
(DB_ENV*)0, 0)])
fi
])
AC_DBA_STD_RESULT(db3,Berkeley DB3)
@@ -289,7 +293,7 @@
break
fi
done
- PHP_DBA_DB_CHECK(2, db-2 db2 db, db_appinit)
+ PHP_DBA_DB_CHECK(2, db-2 db2 db, [(void)db_appinit("", NULL, (DB_ENV*)0, 0)])
fi
])
AC_DBA_STD_RESULT(db2,Berkeley DB2)