Remove obsolete configure flags

* Remove obsolete --enable-demand-attach-fs and --enable-disconnected
  configure flags.  These are now unconditional upstream.

diff --git a/debian/changelog b/debian/changelog
index 2066c5c9b6dcdfdf99c20fa59f26d6c2aee5919a..6a56207434eb462260136355304893a72d398287 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ openafs (1.5.77-1) UNRELEASED; urgency=low
     - Fix s390x kernel build support.
   * Update afs-newcell and README.servers to recommend using the
     demand-attach fileserver binaries and dafs bos type.
+  * Remove obsolete --enable-demand-attach-fs and --enable-disconnected
+    configure flags.  These are now unconditional upstream.
   * The openafs-fileserver init script now depends on $named since
     apparently the volserver requires DNS during startup.  Thanks, Jaap
     Winius.  (Closes: #589783)

diff --git a/debian/module/rules b/debian/module/rules
index 8db330b855a47f8f579c0b7e10f71ba96bda709d..d311fc4c897a5b23ec37ab5326bf8c7496b20b88 100755 (executable)
--- a/debian/module/rules
+++ b/debian/module/rules
@@ -42,7 +42,7 @@ override_dh_auto_configure:
        sh configure --prefix=$(CURDIR)/debian/tmp \
            --with-afs-sysname=$(SYS_NAME) \
            --with-linux-kernel-headers=$(KSRC) \
-           --with-linux-kernel-packaging --enable-disconnected \
+           --with-linux-kernel-packaging \
            --enable-debug --enable-debug-lwp --enable-debug-kernel \
            $(DEBIAN_OPT_FLAGS) $(DEBIAN_KERN_FLAGS)
 

diff --git a/debian/openafs-modules-dkms.dkms b/debian/openafs-modules-dkms.dkms
index 1de7ffa0c5b8240d71b06b602eb6b1d9d66d5c90..6f0dbbb95b50a1c564005e2fe80884b694c3a447 100644 (file)
--- a/debian/openafs-modules-dkms.dkms
+++ b/debian/openafs-modules-dkms.dkms
@@ -8,7 +8,7 @@ BUILT_MODULE_NAME[0]="$PACKAGE_NAME"
 DEST_MODULE_LOCATION[0]="/updates/dkms/"
 AUTOINSTALL=yes
 
-MAKE[0]="(./configure --enable-disconnected --with-linux-kernel-packaging \
+MAKE[0]="(./configure --with-linux-kernel-packaging \
                       --with-linux-kernel-headers=${kernel_source_dir}
           && make
           && mv src/libafs/MODLOAD-*/openafs.ko .)"

diff --git a/debian/rules b/debian/rules
index 803f9ab9d241b1f69c99ce686600ca84868d706c..2e9eead33d7e65a735e3f89836946ba9b6b70963 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -95,7 +95,6 @@ override_dh_auto_configure:
            --prefix=/usr --mandir=\$${prefix}/share/man \
            --sysconfdir=/etc --libexecdir=/usr/lib --with-krb5 \
            --localstatedir=/var/lib --enable-supergroups \
-           --enable-demand-attach-fs --enable-disconnected \
            --enable-fuse-client --enable-debug --enable-debug-lwp \
            --with-xslt-processor=xsltproc --with-html-xsl=$(HTML_XSL) \
            --enable-reduced-depends $(DEBIAN_OPT_FLAGS) $(SYSTEM)