Change linking from sasldb/.libs/libsasldb.al to sasldb/libsasldb.la
Ondřej Surý
7 years ago
| 0 | From: =?utf-8?q?Ond=C5=99ej_Sur=C3=BD?= <ondrej@sury.org> | |
| 1 | Date: Tue, 25 Oct 2016 10:49:43 +0200 | |
| 2 | Subject: Change linking from sasldb/.libs/libsasldb.al to sasldb/libsasldb.la | |
| 3 | ||
| 4 | --- | |
| 5 | configure.ac | 5 ----- | |
| 6 | utils/Makefile.am | 4 ++-- | |
| 7 | 2 files changed, 2 insertions(+), 7 deletions(-) | |
| 8 | ||
| 9 | diff --git a/configure.ac b/configure.ac | |
| 10 | index 77f75e4..f3569bd 100644 | |
| 11 | --- a/configure.ac | |
| 12 | +++ b/configure.ac | |
| 13 | @@ -612,14 +612,9 @@ AC_ARG_ENABLE(auth-sasldb, [ --enable-auth-sasldb enable experimental SASLdb | |
| 14 | authsasldb=$enableval, | |
| 15 | authsasldb=no) | |
| 16 | if test "$authsasldb" != no; then | |
| 17 | - if test ! -d "../sasldb"; then | |
| 18 | - echo "ERROR: Cannot build sasldb module outside of the full SASL source tree." | |
| 19 | - exit 0; | |
| 20 | - fi | |
| 21 | AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support]) | |
| 22 | SASL_DB_PATH_CHECK() | |
| 23 | SASL_DB_CHECK() | |
| 24 | - SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al" | |
| 25 | fi | |
| 26 | ||
| 27 | AC_ARG_ENABLE(httpform, [ --enable-httpform enable HTTP form authentication [[no]] ], | |
| 28 | diff --git a/utils/Makefile.am b/utils/Makefile.am | |
| 29 | index 17f0457..a9e9a0a 100644 | |
| 30 | --- a/utils/Makefile.am | |
| 31 | +++ b/utils/Makefile.am | |
| 32 | @@ -42,8 +42,8 @@ | |
| 33 | # | |
| 34 | ################################################################ | |
| 35 | ||
| 36 | -all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) | |
| 37 | -all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) | |
| 38 | +all_sasl_libs = ../lib/libsasl2.la ../sasldb/libsasldb.la $(SASL_DB_LIB) $(LIB_SOCKET) | |
| 39 | +all_sasl_static_libs = ../lib/.libs/libsasl2.a ../sasldb/.libs/libsasldb.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) | |
| 40 | ||
| 41 | sbin_PROGRAMS = @SASL_DB_UTILS@ @SMTPTEST_PROGRAM@ pluginviewer dbconverter-2 | |
| 42 | EXTRA_PROGRAMS = saslpasswd2 sasldblistusers2 testsuite testsuitestatic smtptest pluginviewer |