From: handa Date: Tue, 27 Apr 2004 07:39:18 +0000 (+0000) Subject: Check if Xft2 library is available. X-Git-Tag: withdl~257 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a2096f5805b6ddb624306c0187b47e03c6cd7d3;p=m17n%2Fm17n-lib.git Check if Xft2 library is available. (OTF_LD_FLAGS): Set to `libotf-config --libs`. (FREETYPE_LD_FLAGS): Set to `freetype-config --libtool`. --- diff --git a/configure.ac b/configure.ac index 524aa33..3b18fc9 100644 --- a/configure.ac +++ b/configure.ac @@ -91,7 +91,7 @@ CPPFLAGS=$save_CPPFLAGS if test "x$HAVE_OTF" = "xyes"; then AC_DEFINE(HAVE_OTF, 1, [Define to 1 if you have OTF library and header file.]) - OTF_LD_FLAGS="-lotf"; + OTF_LD_FLAGS=`libotf-config --libs` fi AC_SUBST(OTF_LD_FLAGS) @@ -104,13 +104,13 @@ if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then AC_CHECK_HEADER(ft2build.h, HAVE_FREETYPE=yes, HAVE_FREETYPE=no CPPFLAGS=$save_CPPFLAGS) if test "x$HAVE_FREETYPE" = "xyes" ; then - FREETYPE_LD_FLAGS=`freetype-config --libs`; save_LIBS=$LIBS - LIBS="$LIBS $FREETYPE_LD_FLAGS" + LIBS="$LIBS `freetype-config --libs`" AC_CHECK_LIB(freetype, FT_Init_FreeType, HAVE_FREETYPE=yes, HAVE_FREETYPE=no) LIBS=$save_LIBS if test "x$HAVE_FREETYPE" = "xyes"; then + FREETYPE_LD_FLAGS=`freetype-config --libtool` AC_DEFINE(HAVE_FREETYPE, 1, [Define to 1 if you have FreeType library and header file.]) fi @@ -118,6 +118,23 @@ if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then fi AC_SUBST(FREETYPE_LD_FLAGS) +# Check for Xft2 usability. +AC_CHECK_LIB(Xft, XftDrawCreate, HAVE_XFT2=yes, HAVE_XFT2=no) +if test "x$HAVE_XFT2" = "xyes"; then + AC_CHECK_HEADER(X11/Xft/Xft.h, HAVE_XFT2=yes, HAVE_XFT2=no, + [#include +#if XftVersion >= 20000 +#else +Version too old. Compiling this line should fail. +#endif]) + if test "x$HAVE_XFT2" = "xyes"; then + AC_DEFINE(HAVE_XFT2, 1, + [Define to 1 if you have Xft2 library and header file.]) + XFT2_LD_FLAGS="-lXft" + fi +fi +AC_SUBST(XFT2_LD_FLAGS) + # Check for libxml2 usability. AC_CHECK_LIB(xml2, xmlParseMemory, HAVE_XML2=yes, HAVE_XML2=no) if test "x$HAVE_XML2" = "xyes"; then