diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index 7a30bc7e1d37a28a0fc2e42bd6490ebb96f1bff8..9eeb0dfca549787a261a8d0be7a2f342c76c4909 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.173 2003-04-02 05:53:23 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.174 2003-04-02 06:25:20 geuzaine Exp $
 //
 // Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
 //
@@ -553,15 +553,23 @@ void file_save_as_cb(CALLBACK_ARGS)
     {"GIF (*.gif)", _save_gif},
     {"GIF dithered (*.gif)", _save_gif_dithered},
     {"GIF transparent (*.gif)", _save_gif_transparent},
+#if defined(HAVE_LIBJPEG)
     {"JPEG (*.jpg)", _save_jpeg},
+#endif
+#if defined(HAVE_LIBPNG)
     {"PNG (*.png)", _save_png},
+#endif
     {"PostScript fast (*.ps)", _save_ps_simple},
     {"PostScript accurate (*.ps)", _save_ps_accurate},
     {"Encapsulated PostScript fast (*.eps)", _save_eps_simple},
     {"Encapsulated PostScript accurate (*.eps)", _save_eps_accurate},
     {"PPM (*.ppm)", _save_ppm},
+#if defined(HAVE_LIBJPEG)
     {"LaTeX JPEG part (*.jpg)", _save_jpegtex},
+#endif
+#if defined(HAVE_LIBPNG)
     {"LaTeX PNG part (*.png)", _save_pngtex},
+#endif
     {"LaTeX EPS part fast (*.eps)", _save_epstex_simple},
     {"LaTeX EPS part accurate (*.eps)", _save_epstex_accurate},
     {"LaTeX TeX part (*.tex)", _save_tex},
diff --git a/Fltk/Callbacks.h b/Fltk/Callbacks.h
index 4177df119ab7bf754d90471e88c265696a968fa0..8a74cb89cfef726df16b64bfbe11db140c588c01 100644
--- a/Fltk/Callbacks.h
+++ b/Fltk/Callbacks.h
@@ -59,8 +59,10 @@ void file_save_as_ps_accurate_cb(CALLBACK_ARGS) ;
 void file_save_as_pstex_simple_cb(CALLBACK_ARGS) ;
 void file_save_as_pstex_accurate_cb(CALLBACK_ARGS) ;
 void file_save_as_jpegtex_cb(CALLBACK_ARGS) ;
+void file_save_as_pngtex_cb(CALLBACK_ARGS) ;
 void file_save_as_tex_cb(CALLBACK_ARGS) ;
 void file_save_as_jpeg_cb(CALLBACK_ARGS) ;
+void file_save_as_png_cb(CALLBACK_ARGS) ;
 void file_save_as_gif_cb(CALLBACK_ARGS) ;
 void file_save_as_gif_dithered_cb(CALLBACK_ARGS) ;
 void file_save_as_gif_transparent_cb(CALLBACK_ARGS) ;
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index f8347dc299a9fcee29e71d5eaffaf948972a1218..66e68dd8f1fcf82271774067b7bd438d7f917fdc 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.235 2003-04-01 17:05:31 geuzaine Exp $
+// $Id: GUI.cpp,v 1.236 2003-04-02 06:25:21 geuzaine Exp $
 //
 // Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
 //
@@ -108,11 +108,21 @@ Fl_Menu_Item m_menubar_table[] = {
          {"GIF (*.gif)...",               0, (Fl_Callback *)file_save_as_gif_cb, 0},
          {"GIF dithered...",              0, (Fl_Callback *)file_save_as_gif_dithered_cb, 0},
          {"GIF transparent...",           0, (Fl_Callback *)file_save_as_gif_transparent_cb, 0},
+#if defined(HAVE_LIBJPEG)
          {"JPEG (*.jpg)...",              0, (Fl_Callback *)file_save_as_jpeg_cb, 0},
+#endif
+#if defined(HAVE_LIBPNG)
+         {"PNG (*.png)...",               0, (Fl_Callback *)file_save_as_png_cb, 0},
+#endif
          {"PostScript fast (*.ps)...",    0, (Fl_Callback *)file_save_as_ps_simple_cb, 0},
          {"PostScript accurate...",       0, (Fl_Callback *)file_save_as_ps_accurate_cb, 0},
          {"PPM (*.ppm)...",               0, (Fl_Callback *)file_save_as_ppm_cb, 0},
+#if defined(HAVE_LIBJPEG)
          {"LaTeX JPEG...",                0, (Fl_Callback *)file_save_as_jpegtex_cb, 0},
+#endif
+#if defined(HAVE_LIBPNG)
+         {"LaTeX PNG...",                 0, (Fl_Callback *)file_save_as_pngtex_cb, 0},
+#endif
          {"LaTeX PostScript fast...",     0, (Fl_Callback *)file_save_as_pstex_simple_cb, 0},
          {"LaTeX PostScript accurate...", 0, (Fl_Callback *)file_save_as_pstex_accurate_cb, 0},
          {"LaTeX TeX (*.tex)...",         0, (Fl_Callback *)file_save_as_tex_cb, 0},