[Pkg-samba-maint] r3922 - trunk/samba/debian

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2011-09-27 07:01:16 +0000 (Tue, 27 Sep 2011)
New Revision: 3922

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/rules
Log:
Drop a few configure options from debian/rules that shadow the built-in
defaults.

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2011-09-27 06:46:14 UTC (rev 3921)
+++ trunk/samba/debian/changelog	2011-09-27 07:01:16 UTC (rev 3922)
@@ -29,6 +29,8 @@
   * Ironically, this means that we have to manually disable dh_auto_test,
     which now finds the makefile targets but doesn't work unless we build an
     extra wrapper library into our binaries that we don't want.
+  * Drop a few configure options from debian/rules that shadow the built-in
+    defaults.
 
  -- Steve Langasek <vorlon at debian.org>  Sat, 24 Sep 2011 13:36:50 -0700
 

Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules	2011-09-27 06:46:14 UTC (rev 3921)
+++ trunk/samba/debian/rules	2011-09-27 07:01:16 UTC (rev 3922)
@@ -18,7 +18,6 @@
 conf_args = \
 		--cache-file=./config.cache \
 		--with-fhs \
-		--enable-shared \
 		--enable-static \
 		--with-privatedir=/etc/samba \
 		--with-piddir=/var/run/samba \
@@ -29,7 +28,6 @@
 		--with-utmp \
 		--with-readline \
 		--with-pam_smbpass \
-		--with-libsmbclient \
 		--with-winbind \
 		--with-shared-modules=idmap_rid,idmap_ad,idmap_adex,idmap_hash,idmap_ldap,idmap_tdb2 \
 		--with-automount \
@@ -39,7 +37,6 @@
 		--without-libtdb \
 		--without-libnetapi \
 		--with-modulesdir=/usr/lib/samba \
-		--datarootdir=/usr/share \
 		--datadir=/usr/share/samba \
 		--with-swatdir=/usr/share/samba/swat \
 		--with-lockdir=/var/run/samba \