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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 10eb27657481e1c90eb64e8a20379daed909e470
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Sun Jun 21 18:01:04 2009 +1000

    Added configuration options to "--version" info
    
    darcs-hash:20090621080104-d4795-2666af88ef9ac96b44edcc5469b73fa4dfe3bfb3.gz

diff --git a/src/gerris.c b/src/gerris.c
index 15c0838..7082fdc 100644
--- a/src/gerris.c
+++ b/src/gerris.c
@@ -123,16 +123,34 @@ int main (int argc, char * argv[])
       break;
     case 'V': /* version */
       fprintf (stderr,
-     "gerris: using %dD libgfs version %s (%s)\n"
-     "compiled with flags: %s\n"
-     "sizeof (GfsStateVector): %d sizeof (FttCell): %d sizeof (FttOct): %d\n",
+	       "gerris: using %dD libgfs version %s (%s)\n"
+	       "  compiled with flags: %s\n"
+	       "  MPI:          %s\n"
+	       "  pkg-config:   %s\n"
+	       "  m4 and awk:   %s\n"
+	       "Copyright (C) 2001-2009 NIWA.\n"
+	       "This is free software; see the source for copying conditions.  There is NO\n"
+	       "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n",
 	       FTT_DIMENSION,
 	       GFS_VERSION,
 	       GFS_BUILD_VERSION,
 	       GFS_COMPILATION_FLAGS,
-	       sizeof (GfsStateVector),
-	       sizeof (FttCell),
-	       sizeof (struct _FttOct));
+#ifdef HAVE_MPI
+	       "yes",
+#else
+	       "no",
+#endif
+#ifdef HAVE_PKG_CONFIG
+	       "yes",
+#else
+	       "no",
+#endif
+#ifdef HAVE_M4
+	       "yes"
+#else
+	       "no"
+#endif
+	       );
       return 0; /* succes */
       break;
     case '?': /* wrong options */

-- 
Gerris Flow Solver