From cvs-return-5435-apmail-apr-cvs-archive=apr.apache.org@apr.apache.org Mon Jan 05 12:21:47 2004 Return-Path: Delivered-To: apmail-apr-cvs-archive@www.apache.org Received: (qmail 35809 invoked from network); 5 Jan 2004 12:21:47 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 5 Jan 2004 12:21:47 -0000 Received: (qmail 96487 invoked by uid 500); 5 Jan 2004 12:21:46 -0000 Delivered-To: apmail-apr-cvs-archive@apr.apache.org Received: (qmail 96450 invoked by uid 500); 5 Jan 2004 12:21:45 -0000 Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@apr.apache.org Delivered-To: mailing list cvs@apr.apache.org Received: (qmail 96437 invoked by uid 500); 5 Jan 2004 12:21:45 -0000 Delivered-To: apmail-apr-util-cvs@apache.org Date: 5 Jan 2004 12:21:46 -0000 Message-ID: <20040105122146.35786.qmail@minotaur.apache.org> From: jorton@apache.org To: apr-util-cvs@apache.org Subject: cvs commit: apr-util/build dbm.m4 X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N jorton 2004/01/05 04:21:46 Modified: build dbm.m4 Log: * 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. Revision Changes Path 1.8 +9 -3 apr-util/build/dbm.m4 Index: dbm.m4 =================================================================== RCS file: /home/cvs/apr-util/build/dbm.m4,v retrieving revision 1.7 retrieving revision 1.8 diff -b -d -u -r1.7 -r1.8 --- dbm.m4 3 Jan 2004 15:26:39 -0000 1.7 +++ dbm.m4 5 Jan 2004 12:21:46 -0000 1.8 @@ -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