apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: apr-util/build dbm.m4
Date Sun, 25 Jan 2004 16:47:03 GMT
jorton      2004/01/25 08:47:03

  Modified:    build    Tag: APU_0_9_BRANCH dbm.m4
  Log:
  Backport from HEAD:
  
  * build/dbm.m4 (APU_CHECK_BERKELEY_DB): Don't bother looking for BDB
  in directories which don't exist.  Also fix 'checking checking for...'
  message.
  
  * build/dbm.m4 (APU_CHECK_BERKELEY_DB): Clearly distinguish checks for
  libraries from checks for headers.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.3.2.3   +10 -4     apr-util/build/dbm.m4
  
  Index: dbm.m4
  ===================================================================
  RCS file: /home/cvs/apr-util/build/dbm.m4,v
  retrieving revision 1.3.2.2
  retrieving revision 1.3.2.3
  diff -b -d -u -r1.3.2.2 -r1.3.2.3
  --- dbm.m4	7 Dec 2003 09:59:54 -0000	1.3.2.2
  +++ dbm.m4	25 Jan 2004 16:47:03 -0000	1.3.2.3
  @@ -70,15 +70,21 @@
           description="$header and $lib"
         ;;
         * )
  +        if test -d $bdb_place; then
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
  +        else
  +          AC_MSG_CHECKING([for Berkeley DB $bdb_version in $bdb_place])
  +          AC_MSG_RESULT([directory not found])
  +          continue
  +        fi
           description="$bdb_place"
         ;;
       esac
   
       # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
       # trick to display a message instead.
  -    AC_MSG_CHECKING([checking for Berkeley DB $bdb_version in $description])
  +    AC_MSG_CHECKING([for Berkeley DB $bdb_version in $description])
       AC_MSG_RESULT()
   
       for bdb_libname in $bdb_default_search_lib_names; do
  @@ -100,7 +106,7 @@
                        | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
               changequote([,])
   
  -            AC_MSG_CHECKING([for $bdb_libname])
  +            AC_MSG_CHECKING([for -l$bdb_libname])
               dnl We can't use AC_CACHE_CHECK here, because that won't print out
               dnl the value of the computed cache variable properly.
               AC_CACHE_VAL($cache_id,
  
  
  

Mime
View raw message