[silo-llnl] 27/96: Fixes for autoreconf to work correctly

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository silo-llnl.

commit 02f5d908dcf7a4547a01c6840f71586b9c08b809
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Sep 5 11:34:16 2011 +0100

    Fixes for autoreconf to work correctly
---
 debian/changelog                |  6 ++++
 debian/patches/autoreconf.patch | 78 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/series           |  1 +
 debian/rules                    |  1 +
 4 files changed, 86 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 84004f5..1d4da8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+silo-llnl (4.8-6) unstable; urgency=low
+
+  * Fixes needed to make autoreconf -fiv work correctly. Closes: #619830. 
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Mon, 05 Sep 2011 11:32:49 +0100
+
 silo-llnl (4.8-5) experimental; urgency=low
 
   * Add Multi-arch support.
diff --git a/debian/patches/autoreconf.patch b/debian/patches/autoreconf.patch
new file mode 100644
index 0000000..69b1d36
--- /dev/null
+++ b/debian/patches/autoreconf.patch
@@ -0,0 +1,78 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Fixes needed for autoreconf to work on Debian
+Last-Updated: 2011-09-05
+Forwarded: no
+
+Index: silo-llnl-4.8/configure.ac
+===================================================================
+--- silo-llnl-4.8.orig/configure.ac	2011-09-05 09:54:16.000000000 +0100
++++ silo-llnl-4.8/configure.ac	2011-09-05 11:29:14.000000000 +0100
+@@ -362,6 +362,9 @@
+ dnl
+ dnl     Alastair McKinstry, Fri Aug 25 17:24:00 BST 2011
+ dnl     Add version script support.
++dnl
++dnl     Alastair McKinstry Mon Sep 5 09:55:00 IST 2011
++dnl     Add AC_PROG_F77 needed for autoreconf to work.
+ dnl --------------------------------------------------------------------------
+ 
+ dnl
+@@ -409,6 +412,8 @@
+ dnl This allows multiple src-dir builds within one host.
+ AC_PREFIX_DEFAULT("SILO_TOP_SRC_DIR")
+ 
++AC_PROG_F77
++
+ dnl
+ dnl Handle the python module right away to determine if we need shared libs.
+ dnl Ordinarily, we default to static libs
+@@ -1462,12 +1467,12 @@
+             tools/python/Makefile
+             tools/silex/Makefile
+             tools/silock/Makefile])
+-if test -n "$HZIP"; then
+-  AC_CONFIG_FILES([src/hzip/Makefile])
+-fi
+-if test -n "$FPZIP"; then
+-  AC_CONFIG_FILES([src/fpzip/Makefile])
+-fi
++#if test -n "$HZIP"; then
++#    AC_CONFIG_FILES([src/hzip/Makefile])
++#fi
++#if test -n "$FPZIP"; then
++#    AC_CONFIG_FILES([src/fpzip/Makefile])
++#fi
+ if test -n "$HDF5_DRV"; then
+   AC_CONFIG_FILES([src/libsiloh5.settings])
+ else
+Index: silo-llnl-4.8/src/Makefile.am
+===================================================================
+--- silo-llnl-4.8.orig/src/Makefile.am	2011-09-05 10:06:26.000000000 +0100
++++ silo-llnl-4.8/src/Makefile.am	2011-09-05 11:10:43.000000000 +0100
+@@ -75,17 +75,17 @@
+ DRIVER_DIRS += taurus
+ DRIVER_LIBS += taurus/libsilo_taurus.la
+ endif
+-if HZIP_NEEDED
+-DRIVER_DIRS += hzip
+-DRIVER_LIBS += hzip/libsilo_hzip.la
+-endif
+-if FPZIP_NEEDED
+-DRIVER_DIRS += fpzip
+-DRIVER_LIBS += fpzip/libsilo_fpzip.la
+-endif
++#if HZIP_NEEDED
++#DRIVER_DIRS += hzip
++#DRIVER_LIBS += hzip/libsilo_hzip.la
++#endif
++#if FPZIP_NEEDED
++#DRIVER_DIRS += fpzip
++#DRIVER_LIBS += fpzip/libsilo_fpzip.la
++#endif
+ SUBDIRS = score pdb silo debug \
+ $(DRIVER_DIRS) unknown filters .
+-DIST_SUBDIRS = . debug filters hdf5_drv hzip netcdf \
++DIST_SUBDIRS = . debug filters hdf5_drv netcdf \
+ pdb pdb_drv pdbp_drv score silo taurus unknown
+ MAKESETTINGS = make.settings
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 0a0e8ee..b0ac555 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ testsuite-skip-szip.patch
 test-disable-largefile.patch
 pkgconfig.patch
 version-script.patch
+autoreconf.patch
diff --git a/debian/rules b/debian/rules
index 68de662..f2f995a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ PYVERS:= `pyversions -s`
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 override_dh_auto_configure:
+	autoreconf -fiv
 	dh_auto_configure -- --enable-pythonmodule --enable-silex --with-qt=/usr --enable-pythonmodule --enable-silex --with-qt-bin=/usr/bin --with-qt-lib=/usr/lib  --with-qt-include=/usr/include/qt4 --with-hdf5=/usr/include,/usr/lib CPPFLAGS=" -I$(MPI_INC)"
 
 override_dh_auto_build:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/silo-llnl.git