diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2007-09-14 06:29:31 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2007-09-14 06:29:31 +0000 |
| commit | 3de4c7d7991400cff20b779573e64eaa4d5ac0a3 (patch) | |
| tree | 17a972961c3aba262b2d978e41f17fed9a1e4621 /databases/php5-dba/files/patch-config.m4 | |
| parent | The Java Service Wrapper is an application which has evolved out of a desire (diff) | |
Update to 5.2.4 release.
Diffstat (limited to '')
| -rw-r--r-- | databases/php5-dba/files/patch-config.m4 | 94 |
1 files changed, 42 insertions, 52 deletions
diff --git a/databases/php5-dba/files/patch-config.m4 b/databases/php5-dba/files/patch-config.m4 index 6205c8331286..e8947bd39982 100644 --- a/databases/php5-dba/files/patch-config.m4 +++ b/databases/php5-dba/files/patch-config.m4 @@ -1,52 +1,42 @@ ---- config.m4.orig Tue Dec 5 18:54:52 2006 -+++ config.m4 Wed Feb 7 12:47:51 2007 -@@ -244,6 +244,22 @@ - THIS_PREFIX=$i - THIS_INCLUDE=$i/db4/db.h - break -+ elif test -f "$i/include/db44/db.h"; then -+ THIS_PREFIX=$i -+ THIS_INCLUDE=$i/include/db44/db.h -+ break -+ elif test -f "$i/include/db43/db.h"; then -+ THIS_PREFIX=$i -+ THIS_INCLUDE=$i/include/db43/db.h -+ break -+ elif test -f "$i/include/db42/db.h"; then -+ THIS_PREFIX=$i -+ THIS_INCLUDE=$i/include/db42/db.h -+ break -+ elif test -f "$i/include/db41/db.h"; then -+ THIS_PREFIX=$i -+ THIS_INCLUDE=$i/include/db41/db.h -+ break - elif test -f "$i/include/db4/db.h"; then - THIS_PREFIX=$i - THIS_INCLUDE=$i/include/db4/db.h -@@ -493,7 +509,7 @@ - PHP_DBA_STD_ATTACH - fi - ],[ -- if test "$PHP_DBA" != "no" && test "$HAVE_DBA" = "1"; then -+ if test "$PHP_DBA" != "no" || test "$HAVE_DBA" = "1"; then - PHP_DBA_BUILTIN_CDB - fi - ]) -@@ -511,7 +527,7 @@ - PHP_DBA_BUILTIN_INI - fi - ],[ -- if test "$PHP_DBA" != "no" && test "$HAVE_DBA" = "1"; then -+ if test "$PHP_DBA" != "no" || test "$HAVE_DBA" = "1"; then - PHP_DBA_BUILTIN_INI - fi - ]) -@@ -532,7 +548,7 @@ - PHP_DBA_BUILTIN_FLATFILE - fi - ],[ -- if test "$PHP_DBA" != "no" && test "$HAVE_DBA" = "1"; then -+ if test "$PHP_DBA" != "no" || test "$HAVE_DBA" = "1"; then - PHP_DBA_BUILTIN_FLATFILE - fi - ]) +--- config.m4.orig 2007-07-19 12:50:16.000000000 +0200 ++++ config.m4 2007-09-13 17:24:16.000000000 +0200 +@@ -279,6 +279,30 @@ + THIS_PREFIX=$i + THIS_INCLUDE=$i/db4/db.h + break ++ elif test -f "$i/include/db46/db.h"; then ++ THIS_PREFIX=$i ++ THIS_INCLUDE=$i/include/db46/db.h ++ break ++ elif test -f "$i/include/db45/db.h"; then ++ THIS_PREFIX=$i ++ THIS_INCLUDE=$i/include/db45/db.h ++ break ++ elif test -f "$i/include/db44/db.h"; then ++ THIS_PREFIX=$i ++ THIS_INCLUDE=$i/include/db44/db.h ++ break ++ elif test -f "$i/include/db43/db.h"; then ++ THIS_PREFIX=$i ++ THIS_INCLUDE=$i/include/db43/db.h ++ break ++ elif test -f "$i/include/db42/db.h"; then ++ THIS_PREFIX=$i ++ THIS_INCLUDE=$i/include/db42/db.h ++ break ++ elif test -f "$i/include/db41/db.h"; then ++ THIS_PREFIX=$i ++ THIS_INCLUDE=$i/include/db41/db.h ++ break + elif test -f "$i/include/db4.5/db.h"; then + THIS_PREFIX=$i + THIS_INCLUDE=$i/include/db4.5/db.h +@@ -301,7 +325,7 @@ + break + fi + done +- PHP_DBA_DB_CHECK(4, db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) ++ PHP_DBA_DB_CHECK(4, db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) + fi + PHP_DBA_STD_RESULT(db4,Berkeley DB4) + |