helly Fri Feb 25 21:15:01 2005 EDT
Modified files:
/php-src/ext/dba config.m4
Log:
- Make detection work for macros
http://cvs.php.net/diff.php/php-src/ext/dba/config.m4?r1=1.66&r2=1.67&ty=u
Index: php-src/ext/dba/config.m4
diff -u php-src/ext/dba/config.m4:1.66 php-src/ext/dba/config.m4:1.67
--- php-src/ext/dba/config.m4:1.66 Fri Feb 25 18:51:51 2005
+++ php-src/ext/dba/config.m4 Fri Feb 25 21:15:00 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.66 2005/02/25 23:51:51 helly Exp $
+dnl $Id: config.m4,v 1.67 2005/02/26 02:15:00 helly Exp $
dnl
dnl Suppose we need FlatFile if no support or only CDB is used.
@@ -384,9 +384,18 @@
AC_MSG_CHECKING(for DB1 in header)
AC_MSG_RESULT($THIS_INCLUDE)
if test -n "$THIS_INCLUDE"; then
- PHP_CHECK_LIBRARY($THIS_LIBS, dbopen, [
- AC_DEFINE_UNQUOTED(DB1_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
- AC_DEFINE(DBA_DB1, 1, [ ])
+ PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/$PHP_LIBDIR, -l$THIS_LIBS,[
+ AC_TRY_LINK([
+#include "$THIS_INCLUDE"
+ ],[
+ DB * dbp = dbopen("", 0, 0, DB_HASH, 0);
+ ],[
+ AC_DEFINE_UNQUOTED(DB1_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
+ AC_DEFINE(DBA_DB1, 1, [ ])
+ THIS_RESULT=yes
+ ],[
+ THIS_RESULT=no
+ ])
])
fi
PHP_DBA_STD_ASSIGN
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
