X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.in;h=be260e6b838412f3110f8c651cd1d21f33113560;hb=08d793bb796f608774d6fdefd1950df54477e2c6;hp=1da34f1bac521738477a4f824cedad6a1f884f64;hpb=b48e215ca642d1973e0b1b71e632657c2679443a;p=chaz%2Fopenbox diff --git a/configure.in b/configure.in index 1da34f1b..be260e6b 100644 --- a/configure.in +++ b/configure.in @@ -53,8 +53,6 @@ AC_CHECK_LIB(X11, XOpenDisplay, LIBS="$LIBS $X_EXTRA_LIBS" -Xext_lib="" - dnl Check for XShape extension support and proper library files. SHAPE="" AC_MSG_CHECKING([whether to build support for the XShape extension]) @@ -65,16 +63,16 @@ AC_ARG_ENABLE( if test x$enableval = "xyes"; then AC_MSG_RESULT([yes]) AC_CHECK_LIB(Xext, XShapeCombineShape, - AC_MSG_CHECKING([for X11/extensions/shape.h]) - AC_TRY_LINK( + AC_MSG_CHECKING([for X11/extensions/shape.h]) + AC_TRY_LINK( #include #include #include , long foo = ShapeSet, - AC_MSG_RESULT([yes]) - SHAPE="yes", - AC_MSG_RESULT([no]) - ) + AC_MSG_RESULT([yes]) + SHAPE="yes", + AC_MSG_RESULT([no]) + ) ) else AC_MSG_RESULT([no]) @@ -84,6 +82,34 @@ if test x$SHAPE = "xyes"; then AC_DEFINE(SHAPE,1,Enable support of the XShape extension) fi +dnl Check for Xft extension support and proper library files. +XFT="" +AC_MSG_CHECKING([whether to build support for the Xft extension]) +AC_ARG_ENABLE( + xft, [ --enable-xft enable support of the Xft extension [default=yes]]) + +: ${enableval="yes"} +if test x$enableval = "xyes"; then + AC_MSG_RESULT([yes]) + AC_CHECK_LIB(Xft, XftOpenFontName, + AC_MSG_CHECKING([for X11/Xft/Xft.h]) + AC_TRY_LINK( +#include +#include +, XftFont foo, + AC_MSG_RESULT([yes]) + XFT="yes", + AC_MSG_RESULT([no]) + ) + ) +else + AC_MSG_RESULT([no]) +fi +if test x$XFT = "xyes"; then + LIBS="$LIBS -lXft" + AC_DEFINE(XFT,1,Enable support of the Xft extension) +fi + dnl Check for the Slit SLIT="" AC_MSG_CHECKING([whether to include the Slit])