diff --git a/Post/PViewDataGModel.h b/Post/PViewDataGModel.h
index 94e17631d67fbe0e61b4a5bf1ef6401908de6141..27e839478995254e98326989ec9f2285e59c2e11 100644
--- a/Post/PViewDataGModel.h
+++ b/Post/PViewDataGModel.h
@@ -21,7 +21,6 @@
 // Please report all bugs and problems to <gmsh@geuz.org>.
 
 #include "PViewData.h"
-#include "PViewDataList.h"
 #include "GModel.h"
 #include "SBoundingBox3d.h"
 
diff --git a/configure b/configure
index 3cc96ef72bb4c4882d107f30daca9cdcb535dff8..52fe03bcaca0a06b1dcdb89ebf680d1f4ee26d04 100755
--- a/configure
+++ b/configure
@@ -1287,6 +1287,7 @@ Optional Features:
   --enable-native-file-chooser
                           enable native file chooser (default=yes, except on
                           Linux)
+  --enable-minimal        build minimal standalone version (default=no)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1932,6 +1933,28 @@ if test "${enable_native_file_chooser+set}" = set; then
   enableval=$enable_native_file_chooser;
 fi
 
+# Check whether --enable-minimal was given.
+if test "${enable_minimal+set}" = set; then
+  enableval=$enable_minimal;
+fi
+
+
+if test "x$enable_minimal" = "xyes"; then
+  enable_gui=no;
+  enable_post=no;
+  enable_gsl=no;
+#  enable_occ=no;
+  enable_fm=no;
+  enable_netgen=no;
+  enable_tetgen=no;
+  enable_matheval=no;
+  enable_ann=no;
+  enable_metis=no;
+  enable_med=no;
+  enable_cgns=no;
+  enable_zlib=no;
+  CXXFLAGS=-O2;
+fi
 
 UNAME=`uname`
 HOSTNAME=`hostname`
diff --git a/configure.in b/configure.in
index 5b88acedb60a3f9151fe35fecf64894207ecef06..c3ea5abf621907a6604520f2698989b388e2cc3b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.154 2008-04-28 10:10:51 geuzaine Exp $
+dnl $Id: configure.in,v 1.155 2008-04-29 19:12:38 geuzaine Exp $
 dnl
 dnl Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 dnl
@@ -146,6 +146,27 @@ AC_ARG_ENABLE(universal,
 AC_ARG_ENABLE(native-file-chooser,
               AC_HELP_STRING([--enable-native-file-chooser],
                              [enable native file chooser (default=yes, except on Linux)]))
+AC_ARG_ENABLE(minimal,
+              AC_HELP_STRING([--enable-minimal],
+                             [build minimal standalone version (default=no)]))
+
+dnl "minimal" build shortcut
+if test "x$enable_minimal" = "xyes"; then
+  enable_gui=no;
+  enable_post=no;
+  enable_gsl=no;
+#  enable_occ=no;
+  enable_fm=no;
+  enable_netgen=no;
+  enable_tetgen=no;
+  enable_matheval=no;
+  enable_ann=no;
+  enable_metis=no;
+  enable_med=no;
+  enable_cgns=no;
+  enable_zlib=no;
+  CXXFLAGS=-O2;
+fi
 
 dnl Get the operating system and machine names
 UNAME=`uname`