diff options
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | configure.in | 25 | ||||
| -rw-r--r-- | documentation/intro.html | 15 | ||||
| -rw-r--r-- | fltk.spec | 6 | ||||
| -rw-r--r-- | src/Fl.cxx | 6 |
6 files changed, 46 insertions, 16 deletions
@@ -1,5 +1,11 @@ CHANGES IN FLTK 1.1.0b13 + - Fixed a bug in the Xft support in Fl_Window::hide() + (the config header wasn't included, so the Xft code + wasn't getting called) + - Xdbe support must now be enabled explicitly using + --enable-xdbe due to inconsistent bugs in XFree86 and + others. - Windows resized by a program would revert to their original size when moved under WIN32. - Cygwin can only compile the new WIN32 drag-n-drop code @@ -52,9 +52,13 @@ BUILDING AND INSTALLING FLTK UNDER UNIX AND MacOS X You can run configure yourself to get the exact setup you need. Type "./configure <options>". Options include: + --enable-cygwin - Enable the Cygwin libraries (WIN32) --enable-debug - Enable debugging code & symbols --disable-gl - Disable OpenGL support --enable-shared - Enable generation of shared libraries + --enable-threads - Enable multithreading support + --enable-xdbe - Enable the X double-buffer extension + --enable-xft - Enable the Xft library (anti-aliased fonts) --bindir=/path - Set the location for executables [default = /usr/local/bin] diff --git a/configure.in b/configure.in index e047df9ab..06738a2e6 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.58 2002/04/09 20:36:27 easysw Exp $" +dnl "$Id: configure.in,v 1.33.2.31.2.59 2002/04/10 16:26:33 easysw Exp $" dnl dnl Configuration script for the Fast Light Tool Kit (FLTK). dnl @@ -35,7 +35,7 @@ dnl FLTK library versions... FL_MAJOR_VERSION=1 FL_MINOR_VERSION=1 FL_PATCH_VERSION=0 -FL_RELEASE_VERSION=b12 +FL_RELEASE_VERSION=b13 FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION} AC_SUBST(FL_MAJOR_VERSION) @@ -181,7 +181,7 @@ AC_SUBST(GLDSONAME) AC_ARG_ENABLE(threads, [ --enable-threads enable multi-threading support]) -AC_ARG_WITH(optim, [ --with-optim=\"flags\" use custom optimization flags]) +AC_ARG_WITH(optim, [ --with-optim="flags" use custom optimization flags]) dnl Find commands... AC_PROG_CC @@ -202,7 +202,11 @@ dnl How do we make libraries? AC_PROG_RANLIB AC_PATH_PROG(AR, ar) -if test "$RANLIB" != ":"; then +if test "x$AR" = "x:"; then + AC_MSG_ERROR(Configure could not find the library archiver, aborting.) +fi + +if test "x$RANLIB" != "x:"; then LIBCOMMAND="$AR cr" else LIBCOMMAND="$AR crs" @@ -444,11 +448,12 @@ case $uname in LIBS="-lXft $LIBS")) fi - dnl Check for the Xdbe extension... - AC_CHECK_HEADER(X11/extensions/Xdbe.h, - if test "$uname" != "SunOS"; then - AC_DEFINE(HAVE_XDBE) - fi) + dnl Check for the Xdbe extension unless disabled... + AC_ARG_ENABLE(xdbe, [ --enable-xdbe turn on Xdbe support [default=no]]) + + if test x$enable_xdbe = xyes; then + AC_CHECK_HEADER(X11/extensions/Xdbe.h, AC_DEFINE(HAVE_XDBE)) + fi dnl Check for overlay visuals... AC_CACHE_CHECK(for X overlay visuals, ac_cv_have_overlay, @@ -707,5 +712,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.58 2002/04/09 20:36:27 easysw Exp $". +dnl End of "$Id: configure.in,v 1.33.2.31.2.59 2002/04/10 16:26:33 easysw Exp $". dnl diff --git a/documentation/intro.html b/documentation/intro.html index 2b30a56ad..26c096ba3 100644 --- a/documentation/intro.html +++ b/documentation/intro.html @@ -198,12 +198,27 @@ options are:</P> <DL> + <DT>--enable-cygwin</DT> + <DD>Enable the Cygwin libraries under WIN32</DD> + <DT>--enable-debug</DT> <DD>Enable debugging code & symbols</DD> + <DT>--disable-gl</DT> + <DD>Disable OpenGL support</DD> + <DT>--enable-shared</DT> <DD>Enable generation of shared libraries</DD> + <DT>--enable-threads</DT> + <DD>Enable multithreading support</DD> + + <DT>--enable-xdbe</DT> + <DD>Enable the X double-buffer extension</DD> + + <DT>--enable-xft</DT> + <DD>Enable the Xft library for anti-aliased fonts under X11</DD> + <DT>--bindir=/path</DT> <DD>Set the location for executables [default = $prefix/bin]</DD> @@ -1,5 +1,5 @@ # -# "$Id: fltk.spec,v 1.1.2.9.2.8 2002/03/25 21:39:01 easysw Exp $" +# "$Id: fltk.spec,v 1.1.2.9.2.9 2002/04/10 16:26:33 easysw Exp $" # # RPM spec file for FLTK. # @@ -23,7 +23,7 @@ # Please report all bugs and problems to "fltk-bugs@fltk.org". # -%define version 1.1.0b12 +%define version 1.1.0b13 %define release 0 %define prefix /usr @@ -99,5 +99,5 @@ rm -rf $RPM_BUILD_ROOT %{prefix}/share/doc/fltk/* # -# End of "$Id: fltk.spec,v 1.1.2.9.2.8 2002/03/25 21:39:01 easysw Exp $". +# End of "$Id: fltk.spec,v 1.1.2.9.2.9 2002/04/10 16:26:33 easysw Exp $". # diff --git a/src/Fl.cxx b/src/Fl.cxx index d0eae5094..1b8167b18 100644 --- a/src/Fl.cxx +++ b/src/Fl.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl.cxx,v 1.24.2.41.2.23 2002/03/09 21:33:54 spitzak Exp $" +// "$Id: Fl.cxx,v 1.24.2.41.2.24 2002/04/10 16:26:33 easysw Exp $" // // Main event handling code for the Fast Light Tool Kit (FLTK). // @@ -29,7 +29,7 @@ #include <FL/Fl_Tooltip.H> #include <ctype.h> #include <stdlib.h> -#include <string.h> +#include "flstring.h" // @@ -889,5 +889,5 @@ void Fl_Window::flush() { } // -// End of "$Id: Fl.cxx,v 1.24.2.41.2.23 2002/03/09 21:33:54 spitzak Exp $". +// End of "$Id: Fl.cxx,v 1.24.2.41.2.24 2002/04/10 16:26:33 easysw Exp $". // |