apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stri...@apache.org
Subject cvs commit: apr-util/build dbm.m4
Date Sun, 07 Dec 2003 09:59:55 GMT
striker     2003/12/07 01:59:54

  Modified:    .        Tag: APU_0_9_BRANCH configure.in
               build    Tag: APU_0_9_BRANCH dbm.m4
  Log:
  Backport from 1.0.
  
  * configure.in
  
    Set EXTRA_OS_LIBS correctly for BeOS.
  
  * build/dbm.m4
  
    Add a BeOS search path for Berkeley DB 4 and 4.1.  Add detection
    for Berkeley DB 4.2.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.70.2.1  +1 -5      apr-util/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr-util/configure.in,v
  retrieving revision 1.70
  retrieving revision 1.70.2.1
  diff -u -r1.70 -r1.70.2.1
  --- configure.in	28 Aug 2003 17:29:07 -0000	1.70
  +++ configure.in	7 Dec 2003 09:59:54 -0000	1.70.2.1
  @@ -124,17 +124,13 @@
   EXTRA_OS_LINK=""
   host_alias=`uname -s`
   case "$host_alias" in
  -*BeOS*)
       dnl ### BeOS requires that ALL symbols resolve at LINK time!
       dnl ### 
       dnl ### So, if we're building on BeOS then we need to add in the
       dnl ### apr and expat libraries to the build or it'll die a truly horrible
       dnl ### death. We now use the apr-config tool to determine the correct
       dnl ### library to link against :)
  -    aprlib=`$apr_config --link-libtool`
  -    EXTRA_OS_LINK="$aprlib $top_builddir/xml/expat/lib/libexpat.la"
  -    ;;
  -*AIX*|*Darwin*)
  +*AIX*|*Darwin*|*BeOS*)
       dnl need such stuff as -liconv to be specified when building libaprutil.la
       EXTRA_OS_LINK='$(APRUTIL_LDFLAGS) $(APRUTIL_LIBS)'
       ;;
  
  
  
  No                   revision
  No                   revision
  1.3.2.2   +50 -16    apr-util/build/dbm.m4
  
  Index: dbm.m4
  ===================================================================
  RCS file: /home/cvs/apr-util/build/dbm.m4,v
  retrieving revision 1.3.2.1
  retrieving revision 1.3.2.2
  diff -u -r1.3.2.1 -r1.3.2.2
  --- dbm.m4	29 Oct 2003 20:43:19 -0000	1.3.2.1
  +++ dbm.m4	7 Dec 2003 09:59:54 -0000	1.3.2.2
  @@ -351,7 +351,7 @@
   AC_DEFUN(APU_CHECK_DB4, [
     places=$1
     if test -z "$places"; then
  -    places="std /usr/local /usr/local/BerkeleyDB.4.0"
  +    places="std /usr/local /usr/local/BerkeleyDB.4.0 /boot/home/config"
     fi
     APU_CHECK_BERKELEY_DB("4", "0", "-1",
       "$places",
  @@ -372,7 +372,7 @@
   AC_DEFUN(APU_CHECK_DB41, [
     places=$1
     if test -z "$places"; then
  -    places="std /usr/local/BerkeleyDB.4.1"
  +    places="std /usr/local/BerkeleyDB.4.1 /boot/home/config"
     fi
     APU_CHECK_BERKELEY_DB("4", "1", "-1",
       "$places",
  @@ -385,6 +385,27 @@
   ])
   
   
  +dnl
  +dnl APU_CHECK_DB42: is DB4.2 present?
  +dnl
  +dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
  +dnl
  +AC_DEFUN(APU_CHECK_DB42, [
  +  places=$1
  +  if test -z "$places"; then
  +    places="std /usr/local/BerkeleyDB.4.2 /boot/home/config"
  +  fi
  +  APU_CHECK_BERKELEY_DB("4", "2", "-1",
  +    "$places",
  +    "db4/db.h db.h",
  +    "db-4.2 db4 db"
  +  )
  +  if test "$apu_have_db" = "1"; then
  +    apu_db_version=4
  +  fi
  +])
  +
  +
   AC_DEFUN(APU_CHECK_DB, [
     requested=$1
     check_places=$2
  @@ -432,6 +453,12 @@
         AC_MSG_ERROR(Berkeley db4 not found)
       fi
       ;;
  +  db42)
  +    APU_CHECK_DB42("$check_places")
  +    if test "$apu_db_version" != "4"; then
  +      AC_MSG_ERROR(Berkeley db4 not found)
  +    fi
  +    ;;
     default)
       APU_CHECK_DB_ALL("$check_places")
       ;;
  @@ -439,22 +466,25 @@
   ])
   
   dnl
  -dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.1 to 1.
  +dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.2 to 1.
   dnl
   AC_DEFUN(APU_CHECK_DB_ALL, [
     all_places=$1
  -  
  -  APU_CHECK_DB41("$all_places")
  + 
  +  APU_CHECK_DB42("$all_places")
     if test "$apu_db_version" != "4"; then
  -    APU_CHECK_DB4("$all_places")
  +    APU_CHECK_DB41("$all_places")
       if test "$apu_db_version" != "4"; then
  -      APU_CHECK_DB3("$all_places")
  -      if test "$apu_db_version" != "3"; then
  -        APU_CHECK_DB2("$all_places")
  -        if test "$apu_db_version" != "2"; then
  -          APU_CHECK_DB1("$all_places")
  -          if test "$apu_db_version" != "1"; then
  -            APU_CHECK_DB185("$all_places")
  +      APU_CHECK_DB4("$all_places")
  +      if test "$apu_db_version" != "4"; then
  +        APU_CHECK_DB3("$all_places")
  +        if test "$apu_db_version" != "3"; then
  +          APU_CHECK_DB2("$all_places")
  +          if test "$apu_db_version" != "2"; then
  +            APU_CHECK_DB1("$all_places")
  +            if test "$apu_db_version" != "1"; then
  +              APU_CHECK_DB185("$all_places")
  +            fi
             fi
           fi
         fi
  @@ -488,11 +518,11 @@
   
     AC_ARG_WITH(dbm, [
       --with-dbm=DBM          choose the DBM type to use.
  -      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4}
  +      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42}
     ], [
       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])
  +        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42])
       fi
       requested="$withval"
     ], [
  @@ -666,6 +696,10 @@
         apu_use_db=1
         apu_default_dbm=db4
         ;;
  +    db42)
  +      apu_use_db=1
  +      apu_default_dbm=db4
  +      ;;
       default)
         dnl ### use more sophisticated DBMs for the default?
         apu_default_dbm="sdbm (default)"
  @@ -673,7 +707,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])
  +        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42])
         ;;
     esac
   
  
  
  

Mime
View raw message