svn commit: r783194 - in /apr/apr-util/branches/1.4.x: CHANGES apu-config.in

[bo...@apache.org]

Author: bojan
Date: Wed Jun 10 03:33:21 2009
New Revision: 783194

URL: http://svn.apache.org/viewvc?rev=783194&view=rev
Log:
Expose DBM libs through apu-1-config.

Modified:
    apr/apr-util/branches/1.4.x/CHANGES
    apr/apr-util/branches/1.4.x/apu-config.in

Modified: apr/apr-util/branches/1.4.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/CHANGES?rev=783194&r1=783193&r2=783194&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.4.x/CHANGES [utf-8] Wed Jun 10 03:33:21 2009
@@ -1,6 +1,11 @@
                                                      -*- coding: utf-8 -*-
 Changes with APR-util 1.4.0
 
+  *) Expose DBM libs in apu-1-config by default. To avoid that, use
+     apu-1-config --avoid-dbm --libs. To get just DBM libs, use
+     apu-1-config --dbm-libs.
+     [Bojan Smojver]
+
   *) Make sure --without-ldap works.
      [Arfrever Frehtes Taifersar Arahesis <arfrever.fta gmail.com>]
 

Modified: apr/apr-util/branches/1.4.x/apu-config.in
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/apu-config.in?rev=783194&r1=783193&r2=783194&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/apu-config.in (original)
+++ apr/apr-util/branches/1.4.x/apu-config.in Wed Jun 10 03:33:21 2009
@@ -31,6 +31,7 @@
 INCLUDES="@APRUTIL_INCLUDES@"
 LDFLAGS="@APRUTIL_LDFLAGS@"
 LDAP_LIBS="@LDADD_ldap@"
+DBM_LIBS="@LDADD_dbm_db@ @LDADD_dbm_gdbm@ @LDADD_dbm_ndbm@"
 
 APRUTIL_LIBNAME="@APRUTIL_LIBNAME@"
 
@@ -56,6 +57,8 @@
   --libs            print library information
   --avoid-ldap      do not include ldap library information with --libs
   --ldap-libs       print library information to link with ldap
+  --avoid-dbm       do not include DBM library information with --libs
+  --dbm-libs        print additional library information to link with DBM
   --srcdir          print APR-util source directory
   --link-ld         print link switch(es) for linking to APR-util
   --link-libtool    print the libtool inputs for linking to APR-util
@@ -115,12 +118,18 @@
     --avoid-ldap)
     LDAP_LIBS=""
     ;;
+    --avoid-dbm)
+    DBM_LIBS=""
+    ;;
     --libs)
-    flags="$flags $LDAP_LIBS $LIBS"
+    flags="$flags $LDAP_LIBS $DBM_LIBS $LIBS"
     ;;
     --ldap-libs)
     flags="$flags $LDAP_LIBS"
     ;;
+    --dbm-libs)
+    flags="$flags $DBM_LIBS"
+    ;;
     --includedir)
     if test "$location" = "installed"; then
         flags="$includedir"