- allow php4-dba to use Berkeley DB 4.3

PR:		ports/76150
Submitted by:	Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
Approved by:	maintainer timeout (5 months)
This commit is contained in:
Pav Lucistnik 2005-06-05 20:02:03 +00:00
parent 435998af62
commit 045dcdcadc
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=136854
2 changed files with 13 additions and 5 deletions

View file

@ -1,9 +1,13 @@
--- config.m4.orig Thu Jul 8 16:53:32 2004
+++ config.m4 Thu Jul 8 16:55:49 2004
@@ -203,6 +203,14 @@
--- config.m4.orig Sat Sep 25 23:32:20 2004
+++ config.m4 Wed Jan 12 23:42:24 2005
@@ -206,6 +206,18 @@
THIS_PREFIX=$i
THIS_INCLUDE=$i/db4/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
@ -15,12 +19,12 @@
elif test -f "$i/include/db4/db.h"; then
THIS_PREFIX=$i
THIS_INCLUDE=$i/include/db4/db.h
@@ -221,7 +229,7 @@
@@ -224,7 +236,7 @@
break
fi
done
- PHP_DBA_DB_CHECK(4, 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.2 db-4.1 db-4.0 db-4 db41 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
+ PHP_DBA_DB_CHECK(4, db-4.3 db-4.2 db-4.1 db-4.0 db-4 db41 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
fi
])
AC_DBA_STD_RESULT(db4,Berkeley DB4)

View file

@ -389,6 +389,9 @@ CONFIGURE_ARGS+=--without-cdb
. endif
. if defined(WITH_DB4)
WITH_DB4_VER?= 41
. if ${WITH_DB4_VER} == 43
LIB_DEPENDS+= db-4.3.0:${PORTSDIR}/databases/db43
. else
. if ${WITH_DB4_VER} == 42
LIB_DEPENDS+= db-4.2.2:${PORTSDIR}/databases/db42
. else
@ -398,6 +401,7 @@ LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4
LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41
. endif
. endif
. endif
CONFIGURE_ARGS+=--with-db4=${LOCALBASE}
. endif
. if defined(WITH_GDBM)