cvs commit: apr-util/build dbm.m4

[jo...@apache.org]

jorton      2004/09/23 05:25:47

  Modified:    .        CHANGES
               build    dbm.m4
  Log:
  * build/dbm.m4
      (APU_CHECK_DB43): New function to check BDB 4.3
      (APU_CHECK_DB): Added db43 target
      (APU_CHECK_DB_ALL): Added top most check for db43
      (APU_CHECK_DBM): Document that we could do db43 and add db43 target
  
  Submitted by: Jani Averbach <ja...@jaa.iki.fi>
  
  Revision  Changes    Path
  1.140     +2 -0      apr-util/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr-util/CHANGES,v
  retrieving revision 1.139
  retrieving revision 1.140
  diff -d -w -u -r1.139 -r1.140
  --- CHANGES	15 Sep 2004 11:34:57 -0000	1.139
  +++ CHANGES	23 Sep 2004 12:25:47 -0000	1.140
  @@ -1,5 +1,7 @@
   Changes with APR-util 1.0.1
   
  +  *) Add support for Berkeley DB 4.3.  [Jani Averbach <jaa jaa.iki.fi>]
  +
     *) SECURITY: CAN-2004-0786 (cve.mitre.org)
        Fix input validation in apr_uri_parse() to avoid passing negative
        length to memcpy for malformed IPv6 literal addresses.
  
  
  
  1.12      +45 -13    apr-util/build/dbm.m4
  
  Index: dbm.m4
  ===================================================================
  RCS file: /home/cvs/apr-util/build/dbm.m4,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -d -w -u -r1.11 -r1.12
  --- dbm.m4	15 Jun 2004 10:50:33 -0000	1.11
  +++ dbm.m4	23 Sep 2004 12:25:47 -0000	1.12
  @@ -410,6 +410,25 @@
       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 db4/db.h db.h",
  +    "db-4.3 db43 db4 db"
  +  )
  +  if test "$apu_have_db" = "1"; then
  +    apu_db_version=4
  +  fi
  +])
   
   
   AC_DEFUN(APU_CHECK_DB, [
  @@ -465,6 +484,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 +497,13 @@
   ])
   
   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
   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 @@
         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)
  @@ -524,11 +552,11 @@
   
     AC_ARG_WITH(dbm, [
       --with-dbm=DBM          choose the DBM type to use.
  -      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42}
  +      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43}
     ], [
       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
         ;;