[Pkg-samba-maint] [SCM] Debian packaging for Samba branch, samba_4.0, updated. upstream/4.0.5+dfsg1-806-gfdbe5f7

[Christian Perrier]

The following commit has been merged in the samba_4.0 branch:
commit 4022f98e8452d7c4ec5a2250558012de549a038a
Author: Christian Perrier <bubulle at debian.org>
Date:   Thu May 16 11:47:13 2013 +0200

    Use the same set of configure arguments than 3.6.15 (except those eventually specific to version 4 and above)

diff --git a/debian/changelog b/debian/changelog
index 998e87b..5e3320d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ samba (2:4.0.5+dfsg1-2) UNRELEASED; urgency=low
 
   [ Christian Perrier ]
   * Move libnss_winbind.so.2 and libnss_wins.so.2 to /lib as in 3.6.*
+  * Use the same set of configure arguments than 3.6.15 (except those
+    eventually specific to version 4 and above)
 
  -- Andrew Bartlett <abartlet at samba.org>  Thu, 09 May 2013 15:41:19 +1200
 
diff --git a/debian/rules b/debian/rules
index 5ca60c2..b6e28a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,30 +23,58 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 WAF += -j $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 endif
 
-%:
-	dh $* --with python2
-
-override_dh_auto_configure:
-	$(shell dpkg-buildflags --export=configure) $(WAF) configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--with-piddir=/var/run \
-		--with-modulesdir=/usr/lib/$(DEB_HOST_MULTIARCH)/samba/ \
+conf_args = \
+		--cache-file=./config.cache \
+		--with-fhs \
+		--enable-static \
+		--with-privatedir=/etc/samba \
+		--with-piddir=/var/run/samba \
+		--with-rootsbindir=/sbin \
+		--with-pammodulesdir=/lib/$(DEB_HOST_MULTIARCH)/security \
+		--with-pam \
+		--with-syslog \
+		--with-utmp \
+		--with-readline \
+		--with-pam_smbpass \
+		--with-winbind \
+		--with-shared-modules=idmap_rid,idmap_ad,idmap_adex,idmap_hash,idmap_ldap,idmap_tdb2 \
+		--with-automount \
+		--with-ldap \
+		--with-ads \
+		--with-dnsupdate \
+		--without-libtdb \
+		--without-libnetapi \
+		--with-modulesdir=/usr/lib/samba \
+		--datadir=/usr/share/samba \
+		--with-swatdir=/usr/share/samba/swat \
+		--with-lockdir=/var/run/samba \
+		--with-statedir=/var/lib/samba \
+		--with-cachedir=/var/cache/samba \
+		--with-codepagedir=/usr/share/samba \
+		--with-nmbdsocketdir=/var/run/samba \
+		--enable-external-libtalloc \
+		--without-libtalloc \
+		--without-cifsmount \
+		--disable-avahi \
+		--without-libtdb \
+		--enable-external-libtdb \
+		--disable-smbtorture4 \
+		--with-ctdb=/usr --with-cluster-support=yes \
 		--disable-rpath \
 		--disable-ntdb \
 		--disable-rpath-install \
 		--bundled-libraries=NONE,pytevent,iniparser \
 		--builtin-libraries=replace,ccan \
 		--minimum-library-version="$(shell ./debian/autodeps.py --minimum-library-version)" \
-		--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
-		--enable-fhs \
-		--disable-avahi \
-		--with-dnsupdate \
-		--with-shared-modules=idmap_rid,idmap_ad,idmap_adex,idmap_hash,idmap_ldap,idmap_tdb2 \
 		--without-getpass-replacement
 
+%:
+	dh $* --with python2
+
+override_dh_auto_configure:
+	$(shell dpkg-buildflags --export=configure) $(WAF) configure \
+		$(conf_args)
+
 override_dh_auto_clean:
 	-$(WAF) clean
 	rm -f debian/*.upstart

-- 
Debian packaging for Samba