diff --git a/configure b/configure
index ea27a0aef3581ffe2c08b2dfeb0e22f3ef766ff4..72559195f1eee09493d95990979aaf65bb01a3cb 100755
--- a/configure
+++ b/configure
@@ -834,6 +834,8 @@ Optional Features:
   --enable-gui            build the graphical user interface (default=yes)
   --enable-parallel       enable parallel version (default=no)
   --enable-triangle       compile Triangle if available (default=yes)
+  --enable-jpeg           enable JPEG support (default=yes)
+  --enable-png            enable PNG support (default=yes)
   --enable-static         GCC only: build a statically linked executable
                           (default=no)
 
@@ -1269,6 +1271,16 @@ fi;
 if test "${enable_triangle+set}" = set; then
   enableval="$enable_triangle"
 
+fi;
+# Check whether --enable-jpeg or --disable-jpeg was given.
+if test "${enable_jpeg+set}" = set; then
+  enableval="$enable_jpeg"
+
+fi;
+# Check whether --enable-png or --disable-png was given.
+if test "${enable_png+set}" = set; then
+  enableval="$enable_png"
+
 fi;
 # Check whether --enable-static or --disable-static was given.
 if test "${enable_static+set}" = set; then
@@ -2864,10 +2876,11 @@ echo "$as_me: error: Could not find fltk-config. Try --with-fltk-prefix?" >&2;}
   GMSH_LIBS="${GMSH_LIBS} `$FLTKCONFIG --use-gl --use-images --ldflags`"
   INCLS="${INCLS} `$FLTKCONFIG --use-gl --use-images --cxxflags`"
 
-    if test "x${JPEG_PREFIX}" != "x"; then
-    LDFLAGS="-L${JPEG_PREFIX} -L${JPEG_PREFIX}/lib ${LDFLAGS}"
-  fi
-  echo "$as_me:$LINENO: checking for main in -ljpeg" >&5
+  if test "x$enable_jpeg" != "xno"; then
+        if test "x${JPEG_PREFIX}" != "x"; then
+      LDFLAGS="-L${JPEG_PREFIX} -L${JPEG_PREFIX}/lib ${LDFLAGS}"
+    fi
+    echo "$as_me:$LINENO: checking for main in -ljpeg" >&5
 echo $ECHO_N "checking for main in -ljpeg... $ECHO_C" >&6
 if test "${ac_cv_lib_jpeg_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2922,20 +2935,22 @@ else
   JPEG="no"
 fi
 
-  if test "x${JPEG}" = "xyes"; then
-    FLAGS="-DHAVE_LIBJPEG ${FLAGS}"
-    if test "x${JPEG_PREFIX}" = "x"; then
-      GMSH_LIBS="${GMSH_LIBS} -ljpeg"
-    else
-            GMSH_LIBS="${GMSH_LIBS} -L${JPEG_PREFIX} -L${JPEG_PREFIX}/lib -ljpeg"
-      INCLS="${INCLS} -I${JPEG_PREFIX} -I${JPEG_PREFIX}/include"
+    if test "x${JPEG}" = "xyes"; then
+      FLAGS="-DHAVE_LIBJPEG ${FLAGS}"
+      if test "x${JPEG_PREFIX}" = "x"; then
+        GMSH_LIBS="${GMSH_LIBS} -ljpeg"
+      else
+                GMSH_LIBS="${GMSH_LIBS} -L${JPEG_PREFIX} -L${JPEG_PREFIX}/lib -ljpeg"
+        INCLS="${INCLS} -I${JPEG_PREFIX} -I${JPEG_PREFIX}/include"
+      fi
     fi
   fi
 
-    if test "x${Z_PREFIX}" != "x"; then
-    LDFLAGS="-L${Z_PREFIX} -L${Z_PREFIX}/lib ${LDFLAGS}"
-  fi
-  echo "$as_me:$LINENO: checking for main in -lz" >&5
+  if test "x$enable_png" != "xno"; then
+        if test "x${Z_PREFIX}" != "x"; then
+      LDFLAGS="-L${Z_PREFIX} -L${Z_PREFIX}/lib ${LDFLAGS}"
+    fi
+    echo "$as_me:$LINENO: checking for main in -lz" >&5
 echo $ECHO_N "checking for main in -lz... $ECHO_C" >&6
 if test "${ac_cv_lib_z_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2990,11 +3005,11 @@ else
   Z="no"
 fi
 
-  if test "x${Z}" = "xyes"; then
-        if test "x${PNG_PREFIX}" != "x"; then
-      LDFLAGS="-L${PNG_PREFIX} -L${PNG_PREFIX}/lib ${LDFLAGS}"
-    fi
-    echo "$as_me:$LINENO: checking for main in -lpng" >&5
+    if test "x${Z}" = "xyes"; then
+            if test "x${PNG_PREFIX}" != "x"; then
+        LDFLAGS="-L${PNG_PREFIX} -L${PNG_PREFIX}/lib ${LDFLAGS}"
+      fi
+      echo "$as_me:$LINENO: checking for main in -lpng" >&5
 echo $ECHO_N "checking for main in -lpng... $ECHO_C" >&6
 if test "${ac_cv_lib_png_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3049,17 +3064,18 @@ else
   PNG="no"
 fi
 
-    if test "x${PNG}" = "xyes"; then
-      FLAGS="-DHAVE_LIBPNG ${FLAGS}"
-            if test "x${PNG_PREFIX}" != "x"; then
-        GMSH_LIBS="${GMSH_LIBS} -L${PNG_PREFIX} -L${PNG_PREFIX}/lib"
-        INCLS="${INCLS} -I${PNG_PREFIX} -I${PNG_PREFIX}/include"
-      fi
-      if test "x${Z_PREFIX}" != "x"; then
-        GMSH_LIBS="${GMSH_LIBS} -L${Z_PREFIX} -L${Z_PREFIX}/lib -lz"
-        INCLS="${INCLS} -I${Z_PREFIX} -I${Z_PREFIX}/include"
+      if test "x${PNG}" = "xyes"; then
+        FLAGS="-DHAVE_LIBPNG ${FLAGS}"
+                if test "x${PNG_PREFIX}" != "x"; then
+          GMSH_LIBS="${GMSH_LIBS} -L${PNG_PREFIX} -L${PNG_PREFIX}/lib"
+          INCLS="${INCLS} -I${PNG_PREFIX} -I${PNG_PREFIX}/include"
+        fi
+        if test "x${Z_PREFIX}" != "x"; then
+          GMSH_LIBS="${GMSH_LIBS} -L${Z_PREFIX} -L${Z_PREFIX}/lib -lz"
+          INCLS="${INCLS} -I${Z_PREFIX} -I${Z_PREFIX}/include"
+        fi
+        GMSH_LIBS="${GMSH_LIBS} -lpng -lz"
       fi
-      GMSH_LIBS="${GMSH_LIBS} -lpng -lz"
     fi
   fi
 
diff --git a/configure.in b/configure.in
index 7cda1c3c4ecd7e485839c3c11608f07552005f3b..6a2c090edcfbd28628f3723a0e66ecede4bddd77 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.34 2003-04-02 05:53:23 geuzaine Exp $
+dnl $Id: configure.in,v 1.35 2003-04-02 06:45:09 geuzaine Exp $
 dnl
 dnl Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
 dnl
@@ -63,6 +63,12 @@ AC_ARG_ENABLE(parallel,
 AC_ARG_ENABLE(triangle,
               AC_HELP_STRING([--enable-triangle],
                              [compile Triangle if available (default=yes)]))
+AC_ARG_ENABLE(jpeg,
+              AC_HELP_STRING([--enable-jpeg],
+                             [enable JPEG support (default=yes)]))
+AC_ARG_ENABLE(png,
+              AC_HELP_STRING([--enable-png],
+                             [enable PNG support (default=yes)]))
 AC_ARG_ENABLE(static,
               AC_HELP_STRING([--enable-static],
                              [GCC only: build a statically linked executable (default=no)]))
@@ -127,47 +133,51 @@ if test "x$enable_gui" != "xno"; then
   GMSH_LIBS="${GMSH_LIBS} `$FLTKCONFIG --use-gl --use-images --ldflags`"
   INCLS="${INCLS} `$FLTKCONFIG --use-gl --use-images --cxxflags`"
 
-  dnl Check if libjpeg is available to enable/disable gl2jpg
-  if test "x${JPEG_PREFIX}" != "x"; then
-    LDFLAGS="-L${JPEG_PREFIX} -L${JPEG_PREFIX}/lib ${LDFLAGS}"
-  fi
-  AC_CHECK_LIB(jpeg,main,JPEG="yes",JPEG="no")
-  if test "x${JPEG}" = "xyes"; then
-    FLAGS="-DHAVE_LIBJPEG ${FLAGS}"
-    if test "x${JPEG_PREFIX}" = "x"; then
-      GMSH_LIBS="${GMSH_LIBS} -ljpeg"
-    else
-      dnl Find the libs/includes even if libjpeg is _not_ properly installed (ugly hack!)
-      GMSH_LIBS="${GMSH_LIBS} -L${JPEG_PREFIX} -L${JPEG_PREFIX}/lib -ljpeg"
-      INCLS="${INCLS} -I${JPEG_PREFIX} -I${JPEG_PREFIX}/include"
+  if test "x$enable_jpeg" != "xno"; then
+    dnl Check if libjpeg is available to enable/disable gl2jpg
+    if test "x${JPEG_PREFIX}" != "x"; then
+      LDFLAGS="-L${JPEG_PREFIX} -L${JPEG_PREFIX}/lib ${LDFLAGS}"
     fi
-  fi 
-
-  dnl Check if libz is available (prerequisite for libpng)
-  if test "x${Z_PREFIX}" != "x"; then
-    LDFLAGS="-L${Z_PREFIX} -L${Z_PREFIX}/lib ${LDFLAGS}"
+    AC_CHECK_LIB(jpeg,main,JPEG="yes",JPEG="no")
+    if test "x${JPEG}" = "xyes"; then
+      FLAGS="-DHAVE_LIBJPEG ${FLAGS}"
+      if test "x${JPEG_PREFIX}" = "x"; then
+        GMSH_LIBS="${GMSH_LIBS} -ljpeg"
+      else
+        dnl Find the libs/includes even if libjpeg is _not_ properly installed (ugly hack!)
+        GMSH_LIBS="${GMSH_LIBS} -L${JPEG_PREFIX} -L${JPEG_PREFIX}/lib -ljpeg"
+        INCLS="${INCLS} -I${JPEG_PREFIX} -I${JPEG_PREFIX}/include"
+      fi
+    fi 
   fi
-  AC_CHECK_LIB(z,main,Z="yes",Z="no")
-  if test "x${Z}" = "xyes"; then
-    dnl Check if libpng is available to enable/disable gl2png
-    if test "x${PNG_PREFIX}" != "x"; then
-      LDFLAGS="-L${PNG_PREFIX} -L${PNG_PREFIX}/lib ${LDFLAGS}"
+
+  if test "x$enable_png" != "xno"; then
+    dnl Check if libz is available (prerequisite for libpng)
+    if test "x${Z_PREFIX}" != "x"; then
+      LDFLAGS="-L${Z_PREFIX} -L${Z_PREFIX}/lib ${LDFLAGS}"
     fi
-    AC_CHECK_LIB(png,main,PNG="yes",PNG="no")
-    if test "x${PNG}" = "xyes"; then
-      FLAGS="-DHAVE_LIBPNG ${FLAGS}"
-      dnl Find the libs/includes even if the libs are _not_ properly installed (ugly hack!)
+    AC_CHECK_LIB(z,main,Z="yes",Z="no")
+    if test "x${Z}" = "xyes"; then
+      dnl Check if libpng is available to enable/disable gl2png
       if test "x${PNG_PREFIX}" != "x"; then
-        GMSH_LIBS="${GMSH_LIBS} -L${PNG_PREFIX} -L${PNG_PREFIX}/lib"
-        INCLS="${INCLS} -I${PNG_PREFIX} -I${PNG_PREFIX}/include"
+        LDFLAGS="-L${PNG_PREFIX} -L${PNG_PREFIX}/lib ${LDFLAGS}"
       fi
-      if test "x${Z_PREFIX}" != "x"; then
-        GMSH_LIBS="${GMSH_LIBS} -L${Z_PREFIX} -L${Z_PREFIX}/lib -lz"
-        INCLS="${INCLS} -I${Z_PREFIX} -I${Z_PREFIX}/include"
+      AC_CHECK_LIB(png,main,PNG="yes",PNG="no")
+      if test "x${PNG}" = "xyes"; then
+        FLAGS="-DHAVE_LIBPNG ${FLAGS}"
+        dnl Find the libs/includes even if the libs are _not_ properly installed (ugly hack!)
+        if test "x${PNG_PREFIX}" != "x"; then
+          GMSH_LIBS="${GMSH_LIBS} -L${PNG_PREFIX} -L${PNG_PREFIX}/lib"
+          INCLS="${INCLS} -I${PNG_PREFIX} -I${PNG_PREFIX}/include"
+        fi
+        if test "x${Z_PREFIX}" != "x"; then
+          GMSH_LIBS="${GMSH_LIBS} -L${Z_PREFIX} -L${Z_PREFIX}/lib -lz"
+          INCLS="${INCLS} -I${Z_PREFIX} -I${Z_PREFIX}/include"
+        fi
+        GMSH_LIBS="${GMSH_LIBS} -lpng -lz"
       fi
-      GMSH_LIBS="${GMSH_LIBS} -lpng -lz"
-    fi
-  fi 
+    fi 
+  fi
 
 else