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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 271b47255b2dc904e1c1c7afbecfcf2855e914b4
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Thu May 8 20:43:11 2008 +1000

    GFS_MODULES_DIR is defined in Makefile
    
    This should fix problems when using the --libdir option of configure
    
    darcs-hash:20080508104311-d4795-36d8a3db815fe8b52ecc7aacde219704e1b249ef.gz

diff --git a/configure.in b/configure.in
index 3202846..cf76b34 100644
--- a/configure.in
+++ b/configure.in
@@ -336,7 +336,6 @@ AC_OUTPUT_COMMANDS([
 #define GFSCONFIG_H
 
 __EOF
-        echo "#define GFS_MODULES_DIR \"$libdir\"" >> src/gfsconfig.h
 	if test "$have_gmodule" = "yes"; then
 	  cat >> src/gfsconfig.h <<\__EOF
 #define GFS_HAS_MODULES 1
@@ -394,7 +393,6 @@ __EOF
 ],[
 	build="$build"
 	have_gmodule="$have_gmodule"
-        libdir="${prefix}${libdir}/$PACKAGE"
 ])
 
 dnl generate `src/modules.c'
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 7a50aea..70c473e 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -2,6 +2,8 @@
 
 SUBDIRS = RStarTree fes2004
 
+AM_CPPFLAGS = -DGFS_MODULES_DIR=\"$(libdir)/gerris\"
+
 INCLUDES = -I$(top_srcdir)/src -I$(includedir) \
            -DG_LOG_DOMAIN=\"Gfs-modules\" $(GTS_CFLAGS)
 
diff --git a/src/Makefile.am b/src/Makefile.am
index ade3276..a6392eb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,8 @@
 
 AUTOMAKE_OPTIONS = 1.6
 
+AM_CPPFLAGS = -DGFS_MODULES_DIR=\"$(libdir)/gerris\"
+
 INCLUDES = -I$(top_srcdir) -I$(includedir) \
            -DG_LOG_DOMAIN=\"Gfs\" $(GTS_CFLAGS)
 

-- 
Gerris Flow Solver