diff options
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/php52-dba/files/patch-config.m4 | 23 | ||||
| -rw-r--r-- | databases/php52-sybase_ct/files/patch-config.m4 | 11 |
2 files changed, 9 insertions, 25 deletions
diff --git a/databases/php52-dba/files/patch-config.m4 b/databases/php52-dba/files/patch-config.m4 index 02761b927e42..6c5485dcbb47 100644 --- a/databases/php52-dba/files/patch-config.m4 +++ b/databases/php52-dba/files/patch-config.m4 @@ -1,9 +1,13 @@ ---- config.m4.orig 2007-12-06 15:17:43.000000000 +0100 -+++ config.m4 2008-12-11 12:50:27.000000000 +0100 -@@ -280,6 +280,34 @@ +--- config.m4.orig 2010-07-26 00:28:32.111202104 +0200 ++++ config.m4 2010-07-26 00:28:35.656577336 +0200 +@@ -280,6 +280,38 @@ THIS_PREFIX=$i THIS_INCLUDE=$i/db4/db.h break ++ elif test -f "$i/include/db48/db.h"; then ++ THIS_PREFIX=$i ++ THIS_INCLUDE=$i/include/db48/db.h ++ break + elif test -f "$i/include/db47/db.h"; then + THIS_PREFIX=$i + THIS_INCLUDE=$i/include/db47/db.h @@ -32,15 +36,6 @@ + THIS_PREFIX=$i + THIS_INCLUDE=$i/include/db41/db.h + break - elif test -f "$i/include/db4.6/db.h"; then + elif test -f "$i/include/db4.8/db.h"; then THIS_PREFIX=$i - THIS_INCLUDE=$i/include/db4.6/db.h -@@ -306,7 +334,7 @@ - break - fi - done -- 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)]) -+ PHP_DBA_DB_CHECK(4, db-4.7 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) - + THIS_INCLUDE=$i/include/db4.8/db.h diff --git a/databases/php52-sybase_ct/files/patch-config.m4 b/databases/php52-sybase_ct/files/patch-config.m4 deleted file mode 100644 index ef121d7c4730..000000000000 --- a/databases/php52-sybase_ct/files/patch-config.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- config.m4.orig 2009-03-26 09:53:49.000000000 +0100 -+++ config.m4 2009-03-26 09:55:35.000000000 +0100 -@@ -31,7 +31,7 @@ - fi - - PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR, SYBASE_CT_SHARED_LIBADD) -- if test -f $SYBASE_CT_INCDIR/tds.h; then -+ if test -f $SYBASE_CT_INCDIR/tds_sysdep_public.h; then - PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD) - SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct" - else |