--- configure.ac.orig 2014-11-25 18:18:54.000000000 -0500 +++ configure.ac 2014-11-26 14:57:26.000000000 -0500 @@ -54,15 +54,76 @@ ;; esac -# Check for Xft library -PKG_CHECK_MODULES(XFT, xft, [xft_found=yes], [xft_found=no]) -AC_SUBST(XFT_CFLAGS) -AC_SUBST(XFT_LIBS) -case "$xft_found" in -yes) - AC_DEFINE(XFT,1,[Xft library available]) - ;; -esac +dnl # Check for Xft library +dnl PKG_CHECK_MODULES(XFT, xft, [xft_found=yes], [xft_found=no]) +dnl AC_SUBST(XFT_CFLAGS) +dnl AC_SUBST(XFT_LIBS) +dnl case "$xft_found" in +dnl yes) +dnl AC_DEFINE(XFT,1,[Xft library available]) +dnl ;; +dnl esac + + +dnl jdh +dnl added +# +# freetype2 autoconf +# +LIBFREETYPE2="freetype2 >= 10.0" +AC_ARG_WITH(freetype2, + AC_HELP_STRING([--with-freetype2], + [Use freetype2 for xft (default YES for xft)]), + [USE_FREETYPE2="$withval"], + PKG_CHECK_EXISTS(freetype2, [USE_FREETYPE2="yes"], [USE_FREETYPE2="no"])) +if test "x$USE_FREETYPE2" = "xyes" ; then + PKG_CHECK_MODULES([FREETYPE2], [$LIBFREETYPE2], [HAVE_FREETYPE2="yes"], [HAVE_FREETYPE2="no"]) + if test "x$HAVE_FREETYPE2" = xyes ; then + AC_DEFINE(FREETYPE2, 1, [Support freetyp2]) + AC_DEFINE(HAVE_FREETYPE2, 1, [Support freetyp2]) + AC_DEFINE([USE_FREETYPE2], 1, [Define to 1 to use freetype2 for text]) + REQUIRED_MODULES="$REQUIRED_MODULES $LIBFREETYPE2" + REQUIRED_LIBS="$REQUIRED_LIBS $LIBFREETYPE2" + fi +fi +if ! test "x$HAVE_LIBFREETYPE2" = xyes ; then + unset FREETYPE2 HAVE_LIBFREETYPE2 +fi +# +# Xft autoconf ; for using such fonts on greeter screen +# +LIBXFT="xft >= 1.0" +AC_ARG_WITH(xft, + AC_HELP_STRING([--with-xft], + [Use Xft to draw text (default is YES if installed)]), + [USE_XFT="$withval"], + PKG_CHECK_EXISTS(xft, [USE_XFT="yes"], [USE_XFT="no"]) +) +if test "x$USE_XFT" = "xyes" ; then + PKG_CHECK_MODULES([XFT], [$LIBXFT], [HAVE_XFT="yes"], [HAVE_XFT="no"]) + if test "x$HAVE_XFT" = xyes ; then + AC_DEFINE(XFT, 1, [Support Xft]) + AC_DEFINE(HAVE_XFT, 1, [Support Xft]) + AC_DEFINE([USE_XFT], 1, [Define to 1 to use Xft for text ]) + REQUIRED_MODULES="$REQUIRED_MODULES $LIBXFT $LIBFREETYPE2" + REQUIRED_LIBS="$REQUIRED_LIBS $LIBXFT $LIBFREETYPE2" + XFT_CFLAGS="$XFT_CFLAGS $FREETYPE2_CFLAGS" + XFT_LIBS="$XFT_LIBS $FREETYPE2_LIBS" + fi +fi +if ! test "x$HAVE_XFT" = xyes ; then + unset XFT HAVE_XFT +fi +dnl incl freetype2 into xft since app knows of that or REQ but not of freetype2 +dnl bug: many pkg .h use #if(def) IDENT not HAVE_IDENT, "no" is bad, undef var +dnl Xft depends on freetype +if ! test c"$HAVE_XFT" = c"yes" && ! test c"$HAVE_XFT" = c"yes" ; then + unset XFT HAVE_XFT + unset FREETYPE2 HAVE_FREETYPE2 +fi +# + + # Check for MIT-SHM extension PKG_CHECK_MODULES(XEXT, xext, [xext_found=yes], [xext_found=no])