Fix "Provide --without-fluid configure option " (#725)

Add new --disable-fluid configure option.

Makefile

@@ -16,13 +16,18 @@
 
 include makeinclude
 
-DIRS = $(IMAGEDIRS) $(LIBDECORDIR) src $(CAIRODIR) fluid fltk-options test documentation
+DIRS = $(IMAGEDIRS) $(LIBDECORDIR) src $(CAIRODIR) $(FLUIDDIR) fltk-options test \
+       documentation
 
 all: makeinclude fltk-config
 	for dir in $(DIRS); do\
 		echo "=== making $$dir ===";\
 		(cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\
 	done
+	for dir in $(FLUIDDIR); do\
+	  echo "=== making fluidtest ===";\
+	  (cd test; $(MAKE)  $(MFLAGS) allfluid);\
+	done
 
 install: makeinclude
 	-mkdir -p $(DESTDIR)$(bindir)

configure.ac

@@ -140,6 +140,8 @@ AC_ARG_ENABLE([xinerama], AS_HELP_STRING([--disable-xinerama], [turn off Xineram
 
 AC_ARG_ENABLE([xrender], AS_HELP_STRING([--disable-xrender], [turn off Xrender support]))
 
+AC_ARG_ENABLE([fluid], AS_HELP_STRING([--disable-fluid], [turn off fluid building]))
+
 AS_CASE([$host_os], [cygwin* | mingw*], [
   AC_ARG_ENABLE([gdiplus], AS_HELP_STRING([--disable-gdiplus], [don't use GDI+ for antialiased graphics]))
 
@@ -900,12 +902,15 @@ OSX_ONLY=:
 THREADS=
 LIBDECORDIR=""
 LIBDECORDBUS=""
+FLUIDDIR=""
 
 AC_ARG_WITH([links], AS_HELP_STRING([--with-links], [make header links for common misspellings (default=no)]))
 
 INSTALL_DESKTOP=""
 UNINSTALL_DESKTOP=""
 
+AS_IF([test x$enable_fluid != xno], [FLUIDDIR="fluid"])
+
 AS_CASE([$host_os_gui], [cygwin* | mingw*], [
     dnl Cygwin environment, using windows GDI ...
     # Recent versions of Cygwin are seriously broken and the size
@@ -1409,6 +1414,8 @@ AC_SUBST([HLINKS])
 AC_SUBST([OSX_ONLY])
 AC_SUBST([THREADS])
 
+AC_SUBST([FLUIDDIR])
+
 AC_SUBST([LIBDECORDIR])
 AC_SUBST([LIBDECORDBUS])
 
@@ -1762,6 +1769,10 @@ AS_CASE([$host_os], [mingw*], [
     echo "                 MSys docpath=$msyspath/local/share/doc/fltk"
 ])
 
+AS_IF([test x$enable_fluid != xno], [
+    echo "Build fluid: Yes"
+    ])
+    
 dnl
 echo "Cross-compiling: $fltk_cross_compiling"
 AS_IF([test "$fltk_cross_compiling" = "yes"], [

makeinclude.in

@@ -106,6 +106,9 @@ FLTKCAIROOPTION = @FLTKCAIROOPTION@
 LINKSHARED	= @DSOLINK@ @LINKSHARED@ $(IMAGELIBS) $(CAIROLIBS)
 IMAGELIBS	= -L../lib @IMAGELIBS@
 
+# optional extra build step for fluid:
+FLUIDDIR  = @FLUIDDIR@
+
 # optional extra build step for libdecor:
 LIBDECORDIR	= @LIBDECORDIR@
 LIBDECORDBUS    = @LIBDECORDBUS@

test/Makefile

@@ -156,7 +156,6 @@ ALL =	\
 	button$(EXEEXT) \
 	buttons$(EXEEXT) \
 	cairo_test$(EXEEXT) \
-	checkers$(EXEEXT) \
 	clipboard$(EXEEXT) \
 	clock$(EXEEXT) \
 	colbrowser$(EXEEXT) \
@@ -168,7 +167,6 @@ ALL =	\
 	device$(EXEEXT) \
 	doublebuffer$(EXEEXT) \
 	editor$(EXEEXT) \
-	fast_slow$(EXEEXT) \
 	file_chooser$(EXEEXT) \
 	flex_demo$(EXEEXT) \
 	flex_login$(EXEEXT) \
@@ -180,14 +178,11 @@ ALL =	\
 	icon$(EXEEXT) \
 	iconize$(EXEEXT) \
 	image$(EXEEXT) \
-	inactive$(EXEEXT) \
 	input$(EXEEXT) \
 	input_choice$(EXEEXT) \
-	keyboard$(EXEEXT) \
 	label$(EXEEXT) \
 	line_style$(EXEEXT) \
 	list_visuals$(EXEEXT) \
-	mandelbrot$(EXEEXT) \
 	menubar$(EXEEXT) \
 	message$(EXEEXT) \
 	minimum$(EXEEXT) \
@@ -199,10 +194,7 @@ ALL =	\
 	pack$(EXEEXT) \
 	pixmap$(EXEEXT) \
 	pixmap_browser$(EXEEXT) \
-	preferences$(EXEEXT) \
 	device$(EXEEXT) \
-	radio$(EXEEXT) \
-	resize$(EXEEXT) \
 	resizebox$(EXEEXT) \
 	resize-example1$(EXEEXT) \
 	resize-example2$(EXEEXT) \
@@ -220,20 +212,29 @@ ALL =	\
 	sudoku$(EXEEXT) \
 	symbols$(EXEEXT) \
 	table$(EXEEXT) \
-	tabs$(EXEEXT) \
 	$(THREADS) \
 	tile$(EXEEXT) \
 	tiled_image$(EXEEXT) \
-	tree$(EXEEXT) \
 	twowin$(EXEEXT) \
-	valuators$(EXEEXT) \
 	utf8$(EXEEXT) \
 	windowfocus$(EXEEXT)
-
+	
+ALLFLUID = \
+	checkers$(EXEEXT) \
+	fast_slow$(EXEEXT) \
+	inactive$(EXEEXT) \
+	keyboard$(EXEEXT) \
+	mandelbrot$(EXEEXT) \
+	preferences$(EXEEXT) \
+	radio$(EXEEXT) \
+	resize$(EXEEXT) \
+	tabs$(EXEEXT) \
+	tree$(EXEEXT) \
+	valuators$(EXEEXT) \
+	CubeView$(EXEEXT)
 
 GLALL = \
 	cube$(EXEEXT) \
-	CubeView$(EXEEXT) \
 	fractals$(EXEEXT) \
 	fullscreen$(EXEEXT) \
 	gl_overlay$(EXEEXT) \
@@ -243,6 +244,8 @@ GLALL = \
 
 all:	$(ALL) $(GLDEMOS)
 
+allfluid: $(ALLFLUID)
+
 gldemos:	$(GLALL)
 
 depend:	$(CPPFILES)
@@ -256,7 +259,7 @@ depend:	$(CPPFILES)
 include makedepend
 
 clean:
-	$(RM) $(ALL) $(GLALL) core
+	$(RM) $(ALL) $(ALLFLUID) $(GLALL) core
 	$(RMDIR) *.app
 	$(RM) *.o core.* *~ *.bck *.bak
 	$(RM) CubeViewUI.cxx CubeViewUI.h