summaryrefslogtreecommitdiffstats
path: root/debian/patches/avoid_db_by-default.patch
blob: 712935c754b251f95d5247158e16543416bacc6d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
From: Stefan Fritsch <sf@debian.org>
Subject: Make apu-config not output dbm libs by default. See #622081

--- apr-util.orig/apu-config.in
+++ apr-util/apu-config.in
@@ -32,7 +32,8 @@ INCLUDES="@APRUTIL_INCLUDES@"
 LDFLAGS="@APRUTIL_LDFLAGS@"
 ORIG_LDAP_LIBS="@LDADD_ldap@"
 LDAP_LIBS=""
-DBM_LIBS="@LDADD_dbm_db@ @LDADD_dbm_gdbm@ @LDADD_dbm_ndbm@"
+ORIG_DBM_LIBS="@LDADD_dbm_db@ @LDADD_dbm_gdbm@ @LDADD_dbm_ndbm@"
+DBM_LIBS=""
 
 APRUTIL_LIBNAME="@APRUTIL_LIBNAME@"
 
@@ -58,8 +59,8 @@ Known values for OPTION are:
   --libs            print library information
   --avoid-ldap      do not include ldap library information with --libs (default on Debian)
   --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
+  --avoid-dbm       do not include DBM library information with --libs (default on Debian)
+  --dbm-libs        print 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
@@ -125,7 +126,7 @@ while test $# -gt 0; do
     flags="$flags $ORIG_LDAP_LIBS"
     ;;
     --dbm-libs)
-    flags="$flags $DBM_LIBS"
+    flags="$flags $ORIG_DBM_LIBS"
     ;;
     --includedir)
     if test "$location" = "installed"; then