summaryrefslogtreecommitdiff
path: root/www/apache20/files/patch-srclib:apr-util:build:dbm.m4
diff options
context:
space:
mode:
authorClement Laforet <clement@FreeBSD.org>2005-02-08 15:17:06 +0000
committerClement Laforet <clement@FreeBSD.org>2005-02-08 15:17:06 +0000
commit2e6e1ded1c13724c75c64ea5f5071aeb2c1347f3 (patch)
treeb38efd5fa32d84124e7e7be986a2e3940558ce25 /www/apache20/files/patch-srclib:apr-util:build:dbm.m4
parentUpdate to version 0.2.5 (diff)
- Update to 2.0.53
- Download bz2'd tarball [1] - Add print-closest-mirrors target. It allows you to find the 6 (3 http/3 ftp) closest mirror, base on http://www.apache.org/dyn/closer.cgi/httpd/ make print-closest-mirrors >> /etc/make.conf automatically add the six closest mirror to the head of ${MASTER_SITE_APACHE_HTTPD}. Requested by: delphij
Notes
Notes: svn path=/head/; revision=128282
Diffstat (limited to '')
-rw-r--r--www/apache20/files/patch-srclib:apr-util:build:dbm.m489
1 files changed, 19 insertions, 70 deletions
diff --git a/www/apache20/files/patch-srclib:apr-util:build:dbm.m4 b/www/apache20/files/patch-srclib:apr-util:build:dbm.m4
index 3571ab7b0bb6..cca94b8fdd76 100644
--- a/www/apache20/files/patch-srclib:apr-util:build:dbm.m4
+++ b/www/apache20/files/patch-srclib:apr-util:build:dbm.m4
@@ -1,5 +1,5 @@
---- srclib/apr-util/build/dbm.m4.orig Sat Mar 13 05:36:23 2004
-+++ srclib/apr-util/build/dbm.m4 Mon Jan 17 18:45:29 2005
+--- srclib/apr-util/build/dbm.m4.orig Sun Jan 16 18:27:07 2005
++++ srclib/apr-util/build/dbm.m4 Sat Feb 5 12:14:28 2005
@@ -298,8 +298,8 @@
fi
APU_CHECK_BERKELEY_DB(1, -1, -1,
@@ -42,7 +42,7 @@
)
if test "$apu_have_db" = "1"; then
apu_db_version=4
-@@ -403,8 +403,28 @@
+@@ -403,13 +403,14 @@
fi
APU_CHECK_BERKELEY_DB("4", "2", "-1",
"$places",
@@ -50,82 +50,31 @@
- "db-4.2 db4 db"
+ "db42/db.h",
+ "db-4.2"
-+ )
-+ if test "$apu_have_db" = "1"; then
-+ apu_db_version=4
-+ fi
-+])
-+
-+dnl
-+dnl APU_CHECK_DB43: is DB4.3 present?
-+dnl
-+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
-+dnl
-+AC_DEFUN(APU_CHECK_DB43, [
-+ places=$1
-+ if test -z "$places"; then
-+ places="std /usr/local/BerkeleyDB.4.3 /boot/home/config"
-+ fi
-+ APU_CHECK_BERKELEY_DB("4", "3", "-1",
-+ "$places",
-+ "db43/db.h",
-+ "db-4.3"
)
if test "$apu_have_db" = "1"; then
apu_db_version=4
-@@ -465,6 +485,12 @@
- AC_MSG_ERROR(Berkeley db4 not found)
- fi
- ;;
-+ db43)
-+ APU_CHECK_DB43("$check_places")
-+ if test "$apu_db_version" != "4"; then
-+ AC_MSG_ERROR(Berkeley db4 not found)
-+ fi
-+ ;;
- default)
- APU_CHECK_DB_ALL("$check_places")
- ;;
-@@ -472,11 +498,12 @@
+ fi
])
-
++
dnl
--dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.2 to 1.
-+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.3 to 1.
+ dnl APU_CHECK_DB43: is DB4.3 present?
dnl
- AC_DEFUN(APU_CHECK_DB_ALL, [
- all_places=$1
--
-+ APU_CHECK_DB43("$all_places")
-+ if test "$apu_db_version" != "4"; then
- APU_CHECK_DB42("$all_places")
- if test "$apu_db_version" != "4"; then
- APU_CHECK_DB41("$all_places")
-@@ -496,6 +523,7 @@
+@@ -422,8 +423,8 @@
+ fi
+ APU_CHECK_BERKELEY_DB("4", "3", "-1",
+ "$places",
+- "db43/db.h db4/db.h db.h",
+- "db-4.3 db43 db4 db"
++ "db43/db.h",
++ "db-4.3"
+ )
+ if test "$apu_have_db" = "1"; then
+ apu_db_version=4
+@@ -524,6 +525,7 @@
fi
fi
fi
-+ fi
++
AC_MSG_CHECKING(for Berkeley DB)
if test "$apu_have_db" = "1"; then
AC_MSG_RESULT(found db$apu_db_version)
-@@ -528,7 +556,7 @@
- ], [
- if test "$withval" = "yes"; then
- AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
-- One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42])
-+ One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42,db43])
- fi
- requested="$withval"
- ], [
-@@ -703,6 +731,10 @@
- apu_default_dbm=db4
- ;;
- db42)
-+ apu_use_db=1
-+ apu_default_dbm=db4
-+ ;;
-+ db43)
- apu_use_db=1
- apu_default_dbm=db4
- ;;