Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/apr-util/patches/apr-util-1.3.9-db48.patch

    Contents of /trunk/apr-util/patches/apr-util-1.3.9-db48.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 906 - (show annotations) (download)
    Mon Oct 26 12:31:45 2009 UTC (14 years, 6 months ago) by niro
    File size: 4970 byte(s) 
    fixed patch
    1 --- apr-util-1.3.9/build/dbm.m4.orig 2008-11-21 07:32:58.000000000 +0100
    2 +++ apr-util-1.3.9/build/dbm.m4 2009-10-26 13:40:09.000000000 +0100
    3 @@ -42,7 +42,8 @@
    4 dnl search is skipped.
    5 dnl
    6 dnl We cache the results of individual searches under particular
    7 -dnl prefixes, not the overall result of whether we found Berkeley
    8 +dnl prefixes, not the overall result of whether we found
    9 +Berkeley
    10 dnl DB. That way, the user can re-run the configure script with
    11 dnl different --with-berkeley-db switch values, without interference
    12 dnl from the cache.
    13 @@ -522,6 +523,25 @@
    14 apu_db_version=4
    15 fi
    16 ])
    17 +dnl
    18 +dnl APU_CHECK_DB48: is DB4.8 present?
    19 +dnl
    20 +dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
    21 +dnl
    22 +AC_DEFUN([APU_CHECK_DB48], [
    23 + places=$1
    24 + if test -z "$places"; then
    25 + places="std /usr/local/BerkeleyDB.4.8 /boot/home/config"
    26 + fi
    27 + APU_CHECK_BERKELEY_DB("4", "8", "-1",
    28 + "$places",
    29 + "db48/db.h db4/db.h db.h",
    30 + "db-4.8 db4-4.8 db48 db4 db"
    31 + )
    32 + if test "$apu_have_db" = "1"; then
    33 + apu_db_version=4
    34 + fi
    35 +])
    36
    37 AC_DEFUN([APU_CHECK_DB], [
    38 requested=$1
    39 @@ -606,6 +626,12 @@
    40 AC_MSG_ERROR(Berkeley db4 not found)
    41 fi
    42 ;;
    43 + db48)
    44 + APU_CHECK_DB48("$check_places")
    45 + if test "$apu_db_version" != "4"; then
    46 + AC_MSG_ERROR(Berkeley db4 not found)
    47 + fi
    48 + ;;
    49 default)
    50 APU_CHECK_DB_ALL("$check_places")
    51 ;;
    52 @@ -613,34 +639,37 @@
    53 ])
    54
    55 dnl
    56 -dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.7 to 1.
    57 +dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.8 to 1.
    58 dnl
    59 AC_DEFUN([APU_CHECK_DB_ALL], [
    60 all_places=$1
    61
    62 - APU_CHECK_DB47("$all_places")
    63 + APU_CHECK_DB48("$all_places")
    64 if test "$apu_db_version" != "4"; then
    65 - APU_CHECK_DB46("$all_places")
    66 + APU_CHECK_DB47("$all_places")
    67 if test "$apu_db_version" != "4"; then
    68 - APU_CHECK_DB45("$all_places")
    69 + APU_CHECK_DB46("$all_places")
    70 if test "$apu_db_version" != "4"; then
    71 - APU_CHECK_DB44("$all_places")
    72 + APU_CHECK_DB45("$all_places")
    73 if test "$apu_db_version" != "4"; then
    74 - APU_CHECK_DB43("$all_places")
    75 + APU_CHECK_DB44("$all_places")
    76 if test "$apu_db_version" != "4"; then
    77 - APU_CHECK_DB42("$all_places")
    78 + APU_CHECK_DB43("$all_places")
    79 if test "$apu_db_version" != "4"; then
    80 - APU_CHECK_DB41("$all_places")
    81 + APU_CHECK_DB42("$all_places")
    82 if test "$apu_db_version" != "4"; then
    83 - APU_CHECK_DB4("$all_places")
    84 + APU_CHECK_DB41("$all_places")
    85 if test "$apu_db_version" != "4"; then
    86 - APU_CHECK_DB3("$all_places")
    87 - if test "$apu_db_version" != "3"; then
    88 - APU_CHECK_DB2("$all_places")
    89 - if test "$apu_db_version" != "2"; then
    90 - APU_CHECK_DB1("$all_places")
    91 - if test "$apu_db_version" != "1"; then
    92 - APU_CHECK_DB185("$all_places")
    93 + APU_CHECK_DB4("$all_places")
    94 + if test "$apu_db_version" != "4"; then
    95 + APU_CHECK_DB3("$all_places")
    96 + if test "$apu_db_version" != "3"; then
    97 + APU_CHECK_DB2("$all_places")
    98 + if test "$apu_db_version" != "2"; then
    99 + APU_CHECK_DB1("$all_places")
    100 + if test "$apu_db_version" != "1"; then
    101 + APU_CHECK_DB185("$all_places")
    102 + fi
    103 fi
    104 fi
    105 fi
    106 @@ -679,11 +708,11 @@
    107 apu_db_version=0
    108
    109 AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use.
    110 - DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47}])],
    111 + DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48}])],
    112 [
    113 if test "$withval" = "yes"; then
    114 AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
    115 - One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47])
    116 + One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48])
    117 fi
    118 requested="$withval"
    119 ], [
    120 @@ -882,6 +911,10 @@
    121 apu_use_db=1
    122 apu_default_dbm=db4
    123 ;;
    124 + db48)
    125 + apu_use_db=1
    126 + apu_default_dbm=db4
    127 + ;;
    128 default)
    129 dnl ### use more sophisticated DBMs for the default?
    130 apu_default_dbm="sdbm (default)"
    131 @@ -889,7 +922,7 @@
    132 ;;
    133 *)
    134 AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type.
    135 - Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47])
    136 + Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48])
    137 ;;
    138 esac
    139