diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-03-06 19:42:30 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-03-06 19:42:30 +0000 |
| commit | cab1dedbd1f7f20d56a7c4bcb781569f03f52422 (patch) | |
| tree | a28ea6c7f125a935bd7aadc3ec5a2ecbc0677325 /configure.in | |
| parent | e52b682a995fe2d7662b3f10730420996ccbb146 (diff) | |
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
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 18 |
1 files changed, 11 insertions, 7 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 |