[Pkg-cyrus-sasl2-commits] [cyrus-sasl2] 23/44: Change linking from sasldb/.libs/libsasldb.al to sasldb/libsasldb.la

[Ondřej Surý]

This is an automated email from the git hooks/post-receive script.

ondrej pushed a commit to branch master
in repository cyrus-sasl2.

commit 7627e2072f7a0b25df52d7211cbd470b4906a722
Author: Ondřej Surý <ondrej at sury.org>
Date:   Tue Oct 25 10:51:09 2016 +0200

    Change linking from sasldb/.libs/libsasldb.al to sasldb/libsasldb.la
---
 ...ing-from-sasldb-.libs-libsasldb.al-to-sas.patch | 43 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 44 insertions(+)

diff --git a/debian/patches/0030-Change-linking-from-sasldb-.libs-libsasldb.al-to-sas.patch b/debian/patches/0030-Change-linking-from-sasldb-.libs-libsasldb.al-to-sas.patch
new file mode 100644
index 0000000..2672922
--- /dev/null
+++ b/debian/patches/0030-Change-linking-from-sasldb-.libs-libsasldb.al-to-sas.patch
@@ -0,0 +1,43 @@
+From: =?utf-8?q?Ond=C5=99ej_Sur=C3=BD?= <ondrej at sury.org>
+Date: Tue, 25 Oct 2016 10:49:43 +0200
+Subject: Change linking from sasldb/.libs/libsasldb.al to sasldb/libsasldb.la
+
+---
+ configure.ac      | 5 -----
+ utils/Makefile.am | 4 ++--
+ 2 files changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 77f75e4..f3569bd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -612,14 +612,9 @@ AC_ARG_ENABLE(auth-sasldb, [  --enable-auth-sasldb    enable experimental SASLdb
+   authsasldb=$enableval,
+   authsasldb=no)
+ if test "$authsasldb" != no; then
+-  if test ! -d "../sasldb"; then
+-     echo "ERROR: Cannot build sasldb module outside of the full SASL source tree."
+-     exit 0;
+-  fi
+   AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support])
+   SASL_DB_PATH_CHECK()
+   SASL_DB_CHECK()
+-  SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al"
+ fi
+ 
+ AC_ARG_ENABLE(httpform, [  --enable-httpform       enable HTTP form authentication [[no]] ],
+diff --git a/utils/Makefile.am b/utils/Makefile.am
+index 17f0457..a9e9a0a 100644
+--- a/utils/Makefile.am
++++ b/utils/Makefile.am
+@@ -42,8 +42,8 @@
+ #
+ ################################################################
+ 
+-all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET)
+-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)
++all_sasl_libs = ../lib/libsasl2.la ../sasldb/libsasldb.la $(SASL_DB_LIB) $(LIB_SOCKET)
++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)
+ 
+ sbin_PROGRAMS = @SASL_DB_UTILS@ @SMTPTEST_PROGRAM@ pluginviewer dbconverter-2
+ EXTRA_PROGRAMS = saslpasswd2 sasldblistusers2 testsuite testsuitestatic smtptest pluginviewer
diff --git a/debian/patches/series b/debian/patches/series
index 64c96dd..132a660 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,3 +27,4 @@
 0027-properly-create-libsasl2.pc.patch
 0028-2.1.26-Allow-CAPABILITY-lines-in-IMAP-login-reply-v4.patch
 0029-Fix-early-hangup-in-ipc_unix.c.patch
+0030-Change-linking-from-sasldb-.libs-libsasldb.al-to-sas.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cyrus-sasl2/cyrus-sasl2.git