rules: Explicitly disable all features that are not available.

This ensures consistent builds. Currently matlab, jpeghdr and gdal are
affected.

diff --git a/debian/changelog b/debian/changelog
index c5bb8139623da2a265b0032e9756be23ed398898..7370103d9169309d07f1139b9d65f2dcf5d0f1c9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,11 +18,13 @@ pfstools (1.8.1-1) unstable; urgency=low
     - Install usr/share/pfstools/hdrhtml_*.
   * debian/rules:
     - Use dh_install's --fail-missing instead of --list-missing.
+    - Explicitly disable all features that are not available to ensure
+      consistent builds - currently this is matlab, jpeghdr and gdal.
   * debian/control, debian/rules:
     - Use ${octave:Depends} and octave3.0-depends instead of explicitly
       depending on octave3.0.
 
- -- Sebastian Harl <tokkee@debian.org>  Sun, 07 Jun 2009 16:51:41 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Sun, 07 Jun 2009 21:41:14 +0200
 
 pfstools (1.6.4-2) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
index 155719e0ed0e86e895a53d04a73269b15240f1a7..06c0f3e1587f8f122dfb4b834c8245ae4087283a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,20 @@ endif
 include /usr/share/octave/debian/defs.make
 include /usr/share/dpatch/dpatch.make
 
+confflags = --host=$(DEB_HOST_GNU_TYPE) \
+                       --build=$(DEB_BUILD_GNU_TYPE) \
+                       --prefix=/usr \
+                       --mandir=\$${prefix}/share/man \
+                       --with-moc=moc-qt3 \
+                       --with-octave-m-dir=$(MDIR)/pfstools \
+                       --with-octave-oct-dir=$(OCTDIR)/pfstools
+
+# Matlab is not available in Debian.
+confflags += --disable-matlab
+
+# These libraries are not available / unusable in Debian.
+confflags += --disable-jpeghdr --disable-gdal
+
 config.status: configure $(DPATCH_STAMPFN)
        dh_testdir
        
@@ -32,12 +46,7 @@ config.status: configure $(DPATCH_STAMPFN)
                fi \
        done
        
-       CXXFLAGS="$(CXXFLAGS)" ./configure \
-                       --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-                       --prefix=/usr --mandir=\$${prefix}/share/man \
-                       --with-moc=moc-qt3 \
-                       --with-octave-m-dir=$(MDIR)/pfstools \
-                       --with-octave-oct-dir=$(OCTDIR)/pfstools
+       CXXFLAGS="$(CXXFLAGS)" ./configure $(confflags)
 
 build: build-stamp