From 844360e6108e1671e8a9059d421d14abfd4ca35d Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 28 Sep 2004 17:19:06 +0000
Subject: [PATCH] test fltk version inside #if HAVE_FLTK

---
 Common/GmshUI.h | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/Common/GmshUI.h b/Common/GmshUI.h
index bfc76a0553..6eb64c8e2b 100644
--- a/Common/GmshUI.h
+++ b/Common/GmshUI.h
@@ -21,23 +21,26 @@
 // Please report all bugs and problems to <gmsh@geuz.org>.
 
 #if defined(HAVE_FLTK)
+
 #  include <FL/Fl.H>
+
+// Gmsh requires FLTK 1.1.5 or above (the new dynamic menus don't
+// work with older FLTK versions due to a bug in Fl_Scroll.clear())
+#  if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 1)
+#    if (FL_PATCH_VERSION < 5)
+#      error "Gmsh requires at least FLTK 1.1.5"
+#    endif
+#  else
+#    error "Gmsh requires FLTK branch 1.1"
+#  endif
+
 #  include <FL/gl.h>
 #  if defined(__APPLE__)
 #    include <OpenGL/glu.h>
 #  else
 #    include <GL/glu.h>
 #  endif
-#endif
 
-// Gmsh requires FLTK 1.1.5 or above (the new dynamic menus don't
-// work with older FLTK versions due to a bug in Fl_Scroll.clear())
-#if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 1)
-#  if (FL_PATCH_VERSION < 5)
-#    error "Gmsh requires at least FLTK 1.1.5"
-#  endif
-#else
-#  error "Gmsh requires FLTK branch 1.1"
 #endif
 
 #endif
-- 
GitLab