- obsolete

Changed files:
    apr-util-db47.patch -> 1.2
    apr-util-pg_libs.patch -> 1.2

diff --git a/apr-util-db47.patch b/apr-util-db47.patch
deleted file mode 100644 (file)
index 22b5ec0..0000000
--- a/apr-util-db47.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- apr-util-1.3.0/build/dbm.m4.orig   2008-05-28 18:27:01.000000000 +0200
-+++ apr-util-1.3.0/build/dbm.m4        2008-06-17 00:07:17.967540272 +0200
-@@ -503,6 +503,25 @@
-     apu_db_version=4
-   fi
- ])
-+dnl
-+dnl APU_CHECK_DB47: is DB4.7 present?
-+dnl
-+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
-+dnl
-+AC_DEFUN([APU_CHECK_DB47], [
-+  places=$1
-+  if test -z "$places"; then
-+    places="std /usr/local/BerkeleyDB.4.7 /boot/home/config"
-+  fi
-+  APU_CHECK_BERKELEY_DB("4", "7", "-1",
-+    "$places",
-+    "db47/db.h db4/db.h db.h",
-+    "db-4.7 db4-4.7 db47 db4 db"
-+  )
-+  if test "$apu_have_db" = "1"; then
-+    apu_db_version=4
-+  fi
-+])
- 
- AC_DEFUN([APU_CHECK_DB], [
-   requested=$1
-@@ -581,6 +600,12 @@
-       AC_MSG_ERROR(Berkeley db4 not found)
-     fi
-     ;;
-+  db47)
-+    APU_CHECK_DB47("$check_places")
-+    if test "$apu_db_version" != "4"; then
-+      AC_MSG_ERROR(Berkeley db4 not found)
-+    fi
-+    ;;
-   default)
-     APU_CHECK_DB_ALL("$check_places")
-     ;;
-@@ -593,6 +618,8 @@
- AC_DEFUN([APU_CHECK_DB_ALL], [
-   all_places=$1
-  
-+ APU_CHECK_DB47("$all_places")
-+ if test "$apu_db_version" != "4"; then
-   APU_CHECK_DB46("$all_places")
-   if test "$apu_db_version" != "4"; then
-     APU_CHECK_DB45("$all_places")
-@@ -624,6 +651,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)
-@@ -651,11 +679,11 @@
-   apu_db_version=0
- 
-   AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use.
--      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46}])],
-+      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47}])],
-   [
-     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, db43, db44, db45, db46])
-+        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47])
-     fi
-     requested="$withval"
-   ], [
-@@ -850,6 +878,10 @@
-       apu_use_db=1
-       apu_default_dbm=db4
-       ;;
-+    db47)
-+      apu_use_db=1
-+      apu_default_dbm=db4
-+      ;;
-     default)
-       dnl ### use more sophisticated DBMs for the default?
-       apu_default_dbm="sdbm (default)"
-@@ -857,7 +889,7 @@
-       ;;
-     *)
-       AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type.
--        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46])
-+        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46,db47])
-       ;;
-   esac
- 

diff --git a/apr-util-pg_libs.patch b/apr-util-pg_libs.patch
deleted file mode 100644 (file)
index aa107f6..0000000
--- a/apr-util-pg_libs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- apr-util-1.3.2/build/dbd.m4.orig   2008-08-02 23:04:58.889239352 +0200
-+++ apr-util-1.3.2/build/dbd.m4        2008-08-02 23:09:01.872539663 +0200
-@@ -35,10 +35,9 @@
-       if test "x$PGSQL_CONFIG" != 'x'; then
-         pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`"
-         pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`"
--        pgsql_LIBS="`$PGSQL_CONFIG --libs`"
-+        pgsql_LIBS="-lpq"
- 
-         APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS])
--        APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS])
-         APR_ADDTO(LIBS, [$pgsql_LIBS])
-       fi
- 
-@@ -56,7 +55,7 @@
-       if test "x$PGSQL_CONFIG" != 'x'; then
-         pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`"
-         pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`"
--        pgsql_LIBS="`$PGSQL_CONFIG --libs`"
-+        pgsql_LIBS="-lpq"
-       else
-         pgsql_CPPFLAGS="-I$withval/include"
-         pgsql_LDFLAGS="-L$withval/lib "
-@@ -80,7 +79,7 @@
-     if test "x$PGSQL_CONFIG" != 'x'; then
-       pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`"
-       pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`"
--      pgsql_LIBS="`$PGSQL_CONFIG --libs`"
-+      pgsql_LIBS="-lpq"
- 
-       APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS])
-       APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS])