mirror of
https://github.com/novatiq/packages.git
synced 2026-04-27 06:14:41 +01:00
4cba41ac1d
This is a squash of the following cherry-picked commits:27c472393603124bf4b4141bd5531640c7e952101d25dcde24ea5b746e58a62c0e599ba16b294805c24f5d258bf6c218e74dShort summary: - adds external modules (crypto-openssl dbd-mysql dbd-odbc dbd-pgsql dbd-sqlite3 dbm-gdbm ldap) - Makefile and patches are updated and cleaned - adds myself as maintainer - improves the cross-compile setup (via configure variables sed scripts) For more details please check the individual commits provided above. Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
From: Stefan Fritsch <sf@debian.org>
|
|
Subject: Make apu-config not output dbm libs by default. See #622081
|
|
|
|
--- a/apu-config.in
|
|
+++ b/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 OpenWrt)
|
|
--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 OpenWrt)
|
|
+ --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
|