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
This commit is contained in:
Michael R Sweet
2002-03-06 19:42:30 +00:00
parent e52b682a99
commit cab1dedbd1
5 changed files with 22 additions and 24 deletions
+11 -7
View File
@@ -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