diff options
| -rw-r--r-- | ext/dba/config.m4 | 22 | ||||
| -rw-r--r-- | ext/dba/dba_db2.c | 10 | ||||
| -rw-r--r-- | ext/dba/dba_db3.c | 10 | ||||
| -rw-r--r-- | ext/dba/dba_ndbm.c | 7 |
4 files changed, 17 insertions, 32 deletions
diff --git a/ext/dba/config.m4 b/ext/dba/config.m4 index bc2256ae95..1e0f645b23 100644 --- a/ext/dba/config.m4 +++ b/ext/dba/config.m4 @@ -82,15 +82,15 @@ AC_ARG_WITH(ndbm, for i in /usr/local /usr $withval; do if test -f "$i/include/db1/ndbm.h" ; then THIS_PREFIX="$i" - NDBM_EXTRA="NDBM_DB1_NDBM_H" + NDBM_EXTRA="db1/ndbm.h" elif test -f "$i/include/ndbm.h" ; then THIS_PREFIX="$i" - NDBM_EXTRA="NDBM_NDBM_H" + NDBM_EXTRA="ndbm.h" fi done if test "$NDBM_EXTRA" != ""; then - eval "AC_DEFINE($NDBM_EXTRA, 1)" + AC_DEFINE_UNQUOTED(NDBM_INCLUDE_FILE, "$NDBM_EXTRA", [ ]) fi for LIB in db1 ndbm c; do @@ -116,26 +116,26 @@ AC_ARG_WITH(db2, DB2_EXTRA="db2" elif test -f "$i/include/db2/db.h"; then THIS_PREFIX="$i" - DB2_EXTRA="DB2_DB2_DB_H" + DB2_EXTRA="db2/db.h" elif test -f "$i/include/db/db2.h"; then THIS_PREFIX="$i" - DB2_EXTRA="DB2_DB_DB2_H" + DB2_EXTRA="db/db2.h" elif test -f "$i/include/db2.h"; then THIS_PREFIX="$i" - DB2_EXTRA="DB2_DB2_H" + DB2_EXTRA="db2.h" elif test -f "$i/include/db.h" ; then THIS_PREFIX="$i" - DB2_EXTRA="DB2_DB_H" + DB2_EXTRA="db.h" fi done if test "$DB2_EXTRA" = "db2" ; then DBA_INCLUDE="$DBA_INCLUDE -I$THIS_PREFIX/db2" - DB2_EXTRA="DB2_DB_H" + DB2_EXTRA="db.h" fi if test -n "$DB2_EXTRA"; then - eval "AC_DEFINE($DB2_EXTRA, 1)" + AC_DEFINE_UNQUOTED(DB2_INCLUDE_FILE, "$DB2_EXTRA", [ ]) fi for LIB in db db2 c; do @@ -158,12 +158,12 @@ AC_ARG_WITH(db3, for i in /usr/local /usr $withval; do if test -f "$i/include/db.h" ; then THIS_PREFIX="$i" - DB3_EXTRA="DB3_DB_H" + DB3_EXTRA="db.h" fi done if test -n "$DB3_EXTRA"; then - eval "AC_DEFINE($DB3_EXTRA, 1)" + AC_DEFINE_UNQUOTED(DB3_INCLUDE_FILE, "$DB3_EXTRA", [ ]) fi for LIB in db; do diff --git a/ext/dba/dba_db2.c b/ext/dba/dba_db2.c index b662a644aa..4543dc8666 100644 --- a/ext/dba/dba_db2.c +++ b/ext/dba/dba_db2.c @@ -36,14 +36,8 @@ #include <sys/stat.h> #include <string.h> -#if DB2_DB2_DB_H -#include <db2/db.h> -#elif DB2_DB_DB2_H -#include <db/db2.h> -#elif DB2_DB2_H -#include <db2.h> -#elif DB2_DB_H -#include <db.h> +#ifdef DB2_INCLUDE_FILE +#include DB2_INCLUDE_FILE #endif #define DB2_DATA dba_db2_data *dba = info->dbf diff --git a/ext/dba/dba_db3.c b/ext/dba/dba_db3.c index 38a2065537..50d1a28c35 100644 --- a/ext/dba/dba_db3.c +++ b/ext/dba/dba_db3.c @@ -36,14 +36,8 @@ #include <sys/stat.h> #include <string.h> -#if DB3_DB3_DB_H -#include <db3/db.h> -#elif DB3_DB_DB3_H -#include <db/db3.h> -#elif DB3_DB3_H -#include <db3.h> -#elif DB3_DB_H -#include <db.h> +#ifdef DB3_INCLUDE_FILE +#include DB3_INCLUDE_FILE #endif #define DB3_DATA dba_db3_data *dba = info->dbf diff --git a/ext/dba/dba_ndbm.c b/ext/dba/dba_ndbm.c index 974794701f..8ae24eca53 100644 --- a/ext/dba/dba_ndbm.c +++ b/ext/dba/dba_ndbm.c @@ -35,11 +35,8 @@ #include "php_ndbm.h" #include <fcntl.h> - -#if NDBM_DB1_NDBM_H -#include <db1/ndbm.h> -#elif NDBM_NDBM_H -#include <ndbm.h> +#ifdef NDBM_INCLUDE_FILE +#include NDBM_INCLUDE_FILE #endif #define NDBM_GKEY datum gkey; gkey.dptr = (char *) key; gkey.dsize = keylen |