[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 2feb12629ffe5e8be23c94f231abbfa0ac1db12f
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Thu Jan 29 10:44:08 2009 +1100

    Added fortran dependency for new stokes module
    
    darcs-hash:20090128234408-d4795-ea3d8c3044ce0803579ef70c216a39ccbe1d7c9a.gz

diff --git a/configure.in b/configure.in
index 586c0c5..cdcbb13 100644
--- a/configure.in
+++ b/configure.in
@@ -307,6 +307,10 @@ if test x$netcdf = xfalse -o x$no_gsl = xyes; then
 fi
 AM_CONDITIONAL(BUILD_TIDE, test x$netcdf = xtrue -a x$no_gsl = x)
 
+# Stokes module requires a fortran compiler
+AC_PROG_F77
+AM_CONDITIONAL(BUILD_STOKES, test x$F77 != x)
+
 dnl header file checks
 AC_CHECK_HEADERS(fpu_control.h,
   AC_CHECK_DECL(_FPU_SETCW, 
diff --git a/debian/control.sh b/debian/control.sh
index 82ec306..04b736f 100644
--- a/debian/control.sh
+++ b/debian/control.sh
@@ -5,7 +5,7 @@ Source: gerris-snapshot
 Section: math
 Priority: extra
 Maintainer: Stephane Popinet <popinet at users.sf.net>
-Build-Depends: debhelper (>> 4), autotools-dev, netcdfg-dev, libgsl0-dev
+Build-Depends: debhelper (>> 4), autotools-dev, netcdfg-dev, libgsl0-dev, g77 | gfortran
 
 Package: gerris-snapshot
 Section: math
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 43ad197..465662b 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -13,6 +13,9 @@ endif
 if BUILD_TIDE
 TIDE = libtide2D.la libtide3D.la libtide2D3.la
 endif
+if BUILD_STOKES
+STOKES = libstokes2D.la libstokes3D.la
+endif
 
 pkglib_LTLIBRARIES = \
 	$(MAP) \
@@ -20,8 +23,7 @@ pkglib_LTLIBRARIES = \
 	libterrain3D.la \
 	libterrain2D3.la \
 	$(TIDE) \
-	libstokes2D.la \
-	libstokes3D.la
+	$(STOKES)
 
 bin_PROGRAMS = \
 	xyz2rsurface \
diff --git a/rpm/gerris.spec b/rpm/gerris.spec
index 437cfd6..44e2fdd 100644
--- a/rpm/gerris.spec
+++ b/rpm/gerris.spec
@@ -5,11 +5,11 @@
 Summary: The Gerris Flow Solver (development snapshot)
 Name: gerris
 %if "%{current}" == ""
-Version: 1.3.0
+Version: 1.3.2
 %else
 Version: %{current}
 %endif
-Release: 8.%{alphatag}cvs%{?dist}
+Release: 9.%{alphatag}cvs%{?dist}
 License: GPLv2
 # SuSE should have this macro set. If doubt specify in ~/.rpmmacros
 %if 0%{?suse_version}
@@ -25,11 +25,11 @@ Source0: %{name}-stable.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if 0%{?fedora_version}
 Requires: proj gsl netcdf
-BuildRequires: netcdf-devel proj-devel
+BuildRequires: netcdf-devel proj-devel gcc-gfortran
 %endif
 %if 0%{?suse_version}
 Requires: libproj0 gsl libnetcdf-4
-BuildRequires: libnetcdf-devel libproj-devel
+BuildRequires: libnetcdf-devel libproj-devel gcc-gfortran
 %endif
 # For both distros
 Requires: gts-snapshot-devel >= %{gts_version} pkgconfig gcc sed gawk m4
@@ -153,6 +153,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Thu Jan 29 2008 Ivan Adam Vari <i.vari at niwa.co.nz> - 9
+- Version change (1.3.1 -> 1.3.2) related minor fixes
+- Added fortran dependency
+
 * Wed Jul 16 2008 Ivan Adam Vari <i.vari at niwa.co.nz> - 8
 - Version change (1.2.0 -> 1.3.0) related minor fixes
 - Added macro for gts version specification

-- 
Gerris Flow Solver