[Pkg-cyrus-sasl2-commits] r595 - /cyrus-sasl-2.1/branches/package-consolidate/debian/rules

[roberto at users.alioth.debian.org]

Author: roberto
Date: Sun Aug 22 19:10:07 2010
New Revision: 595

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=595
Log:
Fix variable assignment

Modified:
    cyrus-sasl-2.1/branches/package-consolidate/debian/rules

Modified: cyrus-sasl-2.1/branches/package-consolidate/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/package-consolidate/debian/rules?rev=595&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/package-consolidate/debian/rules (original)
+++ cyrus-sasl-2.1/branches/package-consolidate/debian/rules Sun Aug 22 19:10:07 2010
@@ -60,7 +60,39 @@
 	CONFIGURE_GSSAPI=--disable-gssapi
 endif
 
-CONFIGURE_COMMON_OPTIONS=--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-static --enable-shared --enable-alwaystrue --enable-checkapop --enable-cram --enable-digest --enable-otp --disable-srp --disable-srp-setpass --disable-krb4 $(CONFIGURE_GSSAPI) --enable-gss_mutexes --enable-auth-sasldb --enable-plain --enable-anon --enable-login --enable-ntlm --disable-passdss $(CONFIGURE_SQL) $(CONFIGURE_LDAPDB) --disable-macos-framework --with-pam --with-saslauthd=/var/run/saslauthd $(CONFIGURE_LDAP) --with-pgsql=/usr/include/postgresql --with-configdir=/etc/sasl:/usr/lib/sasl2 --sysconfdir=/etc --with-devrandom=/dev/urandom
+CONFIGURE_COMMON_OPTIONS=--host=$(DEB_HOST_GNU_TYPE) \
+	--build=$(DEB_BUILD_GNU_TYPE) \
+	--prefix=/usr \
+	--mandir=\$${prefix}/share/man \
+	--infodir=\$${prefix}/share/info \
+	--enable-static \
+	--enable-shared \
+	--enable-alwaystrue \
+	--enable-checkapop \
+	--enable-cram \
+	--enable-digest \
+	--enable-otp \
+	--disable-srp \
+	--disable-srp-setpass \
+	--disable-krb4 \
+	$(CONFIGURE_GSSAPI) \
+	--enable-gss_mutexes \
+	--enable-auth-sasldb \
+	--enable-plain \
+	--enable-anon \
+	--enable-login \
+	--enable-ntlm \
+	--disable-passdss \
+	$(CONFIGURE_SQL) \
+	$(CONFIGURE_LDAPDB) \
+	--disable-macos-framework \
+	--with-pam \
+	--with-saslauthd=/var/run/saslauthd \
+	$(CONFIGURE_LDAP) \
+	--with-pgsql=/usr/include/postgresql \
+	--with-configdir=/etc/sasl:/usr/lib/sasl2 \
+	--sysconfdir=/etc \
+	--with-devrandom=/dev/urandom
 
 # Prepare shared library version numbers.
 version=`ls src/.libs/lib*.so.* | \
@@ -144,14 +176,18 @@
 	$(AUTOTOOLS)
 	(cd saslauthd && $(AUTOTOOLS) && cd ..)
 	(mkdir $(TMPBUILD_MIT); cd $(TMPBUILD_MIT); \
-	LDFLAGS="$(LDFLAGS) -L/usr/lib/mit-krb5 -Wl,-z,defs" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -I/usr/include/mit-krb5" ../configure $(CONFIGURE_COMMON_OPTIONS) --with-gss_impl=mit; \
+	LDFLAGS="$(LDFLAGS) -L/usr/lib/mit-krb5 -Wl,-z,defs" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -I/usr/include/mit-krb5" ../configure \
+	        $(CONFIGURE_COMMON_OPTIONS) \
+	        --with-gss_impl=mit; \
 	cd ..)
 	# Cope with the way that ./configure creates symlinks
 	cp $(CURDIR)/sasldb/* $(TMPBUILD_MIT)/sasldb/
 	cp $(CURDIR)/plugins/* $(TMPBUILD_MIT)/plugins/
 	cp $(CURDIR)/lib/* $(TMPBUILD_MIT)/lib/
 	(mkdir $(TMPBUILD_HEIMDAL); cd $(TMPBUILD_HEIMDAL); \
-	LDFLAGS="$(LDFLAGS) -L/usr/lib/heimdal -Wl,-z,defs" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -I/usr/include/heimdal" ../configure $(CONFIGURE_COMMON_OPTIONS) --with-gss_impl=heimdal; \
+	LDFLAGS="$(LDFLAGS) -L/usr/lib/heimdal -Wl,-z,defs" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -I/usr/include/heimdal" ../configure \
+	        $(CONFIGURE_COMMON_OPTIONS) \
+	        --with-gss_impl=heimdal; \
 	cd ..)
 	# Cope with the way that ./configure creates symlinks
 	cp $(CURDIR)/sasldb/* $(TMPBUILD_HEIMDAL)/sasldb/