Fix non-Xft build.

Add "--disable-xft" option to configure script.

Update dependencies.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1988 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

5 files changed, 22 insertions, 24 deletions

diff --git a/configure.in b/configure.in
index e3e1dac81..2b42785e3 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl -*- sh -*-
 dnl the "configure" script is made from this by running GNU "autoconf"
 dnl
-dnl "$Id: configure.in,v 1.33.2.31.2.52 2002/03/06 18:11:00 easysw Exp $"
+dnl "$Id: configure.in,v 1.33.2.31.2.53 2002/03/06 19:42:29 easysw Exp $"
 dnl
 dnl Configuration script for the Fast Light Tool Kit (FLTK).
 dnl
@@ -420,11 +420,15 @@ case $uname in
 	    GLDEMOS=""
 	fi
 
-	dnl Check for the Xft library...
-	AC_CHECK_HEADER(X11/Xft/Xft.h,
-	    AC_CHECK_LIB(Xft, XftDrawCreate,
-	        AC_DEFINE(USE_XFT)
-		LIBS="-lXft $LIBS"))
+	dnl Check for the Xft library unless disabled...
+        AC_ARG_ENABLE(xft, [  --disable-xft           turn off Xft support [default=yes]])
+
+	if test x$enable_xft != xno; then
+	    AC_CHECK_HEADER(X11/Xft/Xft.h,
+		AC_CHECK_LIB(Xft, XftDrawCreate,
+	            AC_DEFINE(USE_XFT)
+		    LIBS="-lXft $LIBS"))
+	fi
 
 	dnl Check for the Xdbe extension...
 	AC_CHECK_HEADER(X11/extensions/Xdbe.h,
@@ -689,5 +693,5 @@ dnl Make sure the fltk-config script is executable...
 chmod +x fltk-config
 
 dnl
-dnl End of "$Id: configure.in,v 1.33.2.31.2.52 2002/03/06 18:11:00 easysw Exp $".
+dnl End of "$Id: configure.in,v 1.33.2.31.2.53 2002/03/06 19:42:29 easysw Exp $".
 dnl
diff --git a/src/fl_font_x.cxx b/src/fl_font_x.cxx
index 50688a52a..139b82312 100644
--- a/src/fl_font_x.cxx
+++ b/src/fl_font_x.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_font_x.cxx,v 1.10.2.1 2002/03/06 18:11:01 easysw Exp $"
+// "$Id: fl_font_x.cxx,v 1.10.2.2 2002/03/06 19:42:30 easysw Exp $"
 //
 // Standard X11 font selection code for the Fast Light Tool Kit (FLTK).
 //
@@ -101,13 +101,13 @@ char* fl_find_fontsize(char* name) {
   return r;
 }
 
-const char* fl_encoding_ = "iso8859-1";
+const char* fl_encoding = "iso8859-1";
 
 // return true if this matches fl_encoding:
 int fl_correct_encoding(const char* name) {
   if (*name != '-') return 0;
   const char* c = fl_font_word(name,13);
-  return (*c++ && !strcmp(c,fl_encoding_));
+  return (*c++ && !strcmp(c,fl_encoding));
 }
 
 // locate or create an Fl_FontSize for a given Fl_Fontdesc and size:
@@ -250,5 +250,5 @@ void fl_draw(const char* str, int n, int x, int y) {
 }
 
 //
-// End of "$Id: fl_font_x.cxx,v 1.10.2.1 2002/03/06 18:11:01 easysw Exp $".
+// End of "$Id: fl_font_x.cxx,v 1.10.2.2 2002/03/06 19:42:30 easysw Exp $".
 //
diff --git a/src/fl_set_fonts_x.cxx b/src/fl_set_fonts_x.cxx
index f301ffcbe..48fa9bffa 100644
--- a/src/fl_set_fonts_x.cxx
+++ b/src/fl_set_fonts_x.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_set_fonts_x.cxx,v 1.1.2.1 2002/03/06 18:11:01 easysw Exp $"
+// "$Id: fl_set_fonts_x.cxx,v 1.1.2.2 2002/03/06 19:42:30 easysw Exp $"
 //
 // X11 font utilities for the Fast Light Tool Kit (FLTK).
 //
@@ -321,8 +321,6 @@ int Fl::get_font_sizes(Fl_Font fnum, int*& sizep) {
   return numsizes;
 }
 
-#endif
-
 //
-// End of "$Id: fl_set_fonts_x.cxx,v 1.1.2.1 2002/03/06 18:11:01 easysw Exp $".
+// End of "$Id: fl_set_fonts_x.cxx,v 1.1.2.2 2002/03/06 19:42:30 easysw Exp $".
 //
diff --git a/src/makedepend b/src/makedepend
index 4506f2254..7518e9819 100644
--- a/src/makedepend
+++ b/src/makedepend
@@ -338,6 +338,7 @@ fl_file_dir.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Choice.H
 fl_file_dir.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H
 fl_font.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 fl_font.o: ../FL/fl_draw.H ../FL/x.H ../FL/Fl_Window.H Fl_Font.H
+fl_font.o: fl_font_x.cxx
 fl_labeltype.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 fl_labeltype.o: ../FL/Fl_Widget.H ../FL/Fl_Group.H ../FL/fl_draw.H
 fl_labeltype.o: ../FL/Fl_Image.H ../FL/x.H ../FL/Fl_Window.H
@@ -348,8 +349,7 @@ fl_oval_box.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 fl_oval_box.o: ../FL/fl_draw.H
 fl_overlay.o: ../FL/x.H ../FL/Enumerations.H ../FL/Fl_Export.H
 fl_overlay.o: ../FL/Fl_Window.H ../FL/fl_draw.H
-fl_overlay_visual.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H
-fl_overlay_visual.o: ../FL/Fl_Export.H ../FL/x.H ../FL/Fl_Window.H
+fl_overlay_visual.o: ../config.h
 fl_plastic.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 fl_plastic.o: ../FL/fl_draw.H
 fl_rect.o: ../FL/Fl_Widget.H ../FL/fl_draw.H ../FL/Enumerations.H
@@ -360,8 +360,8 @@ fl_rounded_box.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 fl_rounded_box.o: ../FL/fl_draw.H
 fl_set_font.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 fl_set_font.o: ../FL/x.H ../FL/Fl_Window.H Fl_Font.H
-fl_set_fonts.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H
-fl_set_fonts.o: ../FL/Fl_Window.H Fl_Font.H
+fl_set_fonts.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
+fl_set_fonts.o: ../FL/x.H ../FL/Fl_Window.H Fl_Font.H fl_set_fonts_x.cxx
 fl_scroll_area.o: ../FL/x.H ../FL/Enumerations.H ../FL/Fl_Export.H
 fl_scroll_area.o: ../FL/Fl_Window.H
 fl_shadow_box.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
diff --git a/test/makedepend b/test/makedepend
index 92f517b13..4228d44f4 100644
--- a/test/makedepend
+++ b/test/makedepend
@@ -304,11 +304,7 @@ tabs.o: tabs.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 tabs.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Tabs.H
 tabs.o: ../FL/Fl_Group.H ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Button.H
 tabs.o: ../FL/Fl_Clock.H ../FL/Fl_Return_Button.H ../FL/Fl_Button.H
-threads.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
-threads.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
-threads.o: ../FL/Fl_Browser.H ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H
-threads.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_Value_Output.H
-threads.o: threads.h
+threads.o: ../config.h ../FL/fl_ask.H ../FL/Enumerations.H ../FL/Fl_Export.H
 tile.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 tile.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H
 tile.o: ../FL/Fl_Widget.H ../FL/Fl_Tile.H ../FL/Fl_Box.H