svn commit: r1390633 - /subversion/trunk/build/ac-macros/berkeley-db.m4

[br...@apache.org]

Author: breser
Date: Wed Sep 26 18:22:06 2012
New Revision: 1390633

URL: http://svn.apache.org/viewvc?rev=1390633&view=rev
Log:
Allow configure to detect BDB on Debian based distros.

Debian modified their apu-config script to not return the BDB
library unless --dbm-libs flag is passed.  Their change is wrong
but it is in the wild so we ought to deal with it.  Reference to the
bug Debian made their change in reaction to:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=622081

* build/ac-macros/berkeley-db.m4
  (SVN_LIB_BERKELEY_DB_TRY): Add --dbm-libs to our detection of SVN_DB_LIBS 

Modified:
    subversion/trunk/build/ac-macros/berkeley-db.m4

Modified: subversion/trunk/build/ac-macros/berkeley-db.m4
URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/berkeley-db.m4?rev=1390633&r1=1390632&r2=1390633&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/berkeley-db.m4 (original)
+++ subversion/trunk/build/ac-macros/berkeley-db.m4 Wed Sep 26 18:22:06 2012
@@ -180,8 +180,12 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB_TRY,
     # Or that it resides in a non-standard location which we would have
     # to compensate with using something like -R`$apu_config --prefix`/lib.
     #
+    # We pass --dbm-libs here since Debian has modified apu-config not
+    # to return -ldb unless --dbm-libs is passed.  This may also produce
+    # extra output beyond -ldb but since we're only filtering for -ldb
+    # it won't matter to us.
     if test -z "$SVN_DB_LIBS"; then
-      SVN_DB_LIBS=["`$apu_config --libs | $SED -e 's/.*\(-ldb[^[:space:]]*\).*/\1/' | $EGREP -- '-ldb[^[:space:]]*'`"]
+      SVN_DB_LIBS=["`$apu_config --libs --dbm-libs | $SED -e 's/.*\(-ldb[^[:space:]]*\).*/\1/' | $EGREP -- '-ldb[^[:space:]]*'`"]
     fi
 
     CPPFLAGS="$SVN_DB_INCLUDES $SVN_APRUTIL_INCLUDES $CPPFLAGS"