diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2003-07-12 04:20:48 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2003-07-12 04:20:48 +0000 |
| commit | 1251b4213058fad9e55c93e05d29bf85cf8b5f28 (patch) | |
| tree | 63f68be96b3ff447b4b83b46466633b4cd6f2ad3 /configure.in | |
| parent | 0341822a56660c140bbc61632cce72fa31c68d5b (diff) | |
Fix Xft2 usage (still need to do a final fix that loads the proper X
font...)
Fix Fl_Window/Fl_Double_Window in FLUID.
Fix background tile coloring for plastic scheme.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3045 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 23c6a9c3d..e774628f6 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.100 2003/06/15 05:37:32 easysw Exp $" +dnl "$Id: configure.in,v 1.33.2.31.2.101 2003/07/12 04:20:48 easysw Exp $" dnl dnl Configuration script for the Fast Light Tool Kit (FLTK). dnl @@ -541,10 +541,17 @@ case $uname in AC_ARG_ENABLE(xft, [ --enable-xft turn on Xft support [default=no]]) if test x$enable_xft = xyes; then - AC_CHECK_HEADER(X11/Xft/Xft.h, - AC_CHECK_LIB(Xft, XftDrawCreate, - AC_DEFINE(USE_XFT) - LIBS="-lXft $LIBS")) + AC_PATH_PROG(FTCONFIG,freetype-config) + + if test "x$FTCONFIG" != "x:"; then + CPPFLAGS="`$FTCONFIG --cflags` $CPPFLAGS" + CXXFLAGS="`$FTCONFIG --cflags` $CXXFLAGS" + + AC_CHECK_HEADER(X11/Xft/Xft.h, + AC_CHECK_LIB(Xft, XftDrawCreate, + AC_DEFINE(USE_XFT) + LIBS="-lXft $LIBS")) + fi fi dnl Check for the Xdbe extension unless disabled... @@ -845,5 +852,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.100 2003/06/15 05:37:32 easysw Exp $". +dnl End of "$Id: configure.in,v 1.33.2.31.2.101 2003/07/12 04:20:48 easysw Exp $". dnl |