X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=configure.in;h=24125c932f6c9cf9da91c1be964cdfe43bd2e126;hb=f693859b3e539527afa2bd65d615bad8402a1e55;hp=1da34f1bac521738477a4f824cedad6a1f884f64;hpb=b48e215ca642d1973e0b1b71e632657c2679443a;p=chaz%2Fopenbox diff --git a/configure.in b/configure.in index 1da34f1b..24125c93 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,36 @@ 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=no]], + if test x$enableval = "xyes"; then + AC_MSG_RESULT([yes]) + + AC_CHECK_LIB(Xft, XftFontOpenXlfd, + AC_MSG_CHECKING([for X11/Xft/Xft.h]) + AC_TRY_LINK( +#include +#include +, XftFont foo, + AC_MSG_RESULT([yes]) + XFT="yes" + LIBS="$LIBS -lXft", + AC_MSG_RESULT([no]) + ) + ) + + else + AC_MSG_RESULT([no]) + fi, + AC_MSG_RESULT([no]) +) +if test x$XFT = "xyes"; then + 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]) @@ -145,7 +173,7 @@ AC_ARG_ENABLE(debug, [ --enable-debug include verbose debugging code [default=no]], if test x$enableval = "xyes"; then AC_MSG_RESULT([yes]) - DEBUG="-DDEBUG -Wall -W" + DEBUG="-DDEBUG -Wall -W -fno-inline" else AC_MSG_RESULT([no]) DEBUG="-DNDEBUG" @@ -222,6 +250,7 @@ AM_CONFIG_HEADER(config.h) AC_OUTPUT(Makefile src/Makefile util/Makefile +util/epist/Makefile data/Makefile data/styles/Makefile doc/Makefile @@ -235,6 +264,7 @@ nls/fr_FR/Makefile nls/hu_HU/Makefile nls/it_IT/Makefile nls/ja_JP/Makefile +nls/ko_KR/Makefile nls/nl_NL/Makefile nls/pt_BR/Makefile nls/ru_RU/Makefile