diff options
| author | Dana Jansens <danakj@orodu.net> | 2002-11-11 08:33:43 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2002-11-11 08:33:43 +0000 |
| commit | fcbb82770cb8d0b727e697830d96c9e131da03a2 (patch) | |
| tree | 31924e84bac1ea49631637ef6efc3734e4cb6158 /configure.ac | |
| parent | cf0823dcf3d1ee8e61be0dfc842b1be3a34b3aee (diff) | |
mad wicked xft checks
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index b7d371bb..6b5537e6 100644 --- a/configure.ac +++ b/configure.ac @@ -93,13 +93,23 @@ AC_CHECK_LIB([X11], [XOpenDisplay], dnl Check for Xft2 AC_MSG_CHECKING([for Xft version 2]) +dnl Store these +OLDLIBS=$LIBS +OLDCPPFLAGS=$CPPFLAGS XFT2="" +XFT_CFLAGS="" +XFT_LIBS="" if pkg-config xft; then AC_MSG_RESULT([yes]) - XFT2="yes" - LIBS="$LIBS `pkg-config --libs xft`" - CXXFLAGS="`pkg-config --cflags xft` $CXXFLAGS" + XFT_CFLAGS="`pkg-config --cflags xft`" + XFT_LIBS="`pkg-config --libs xft`" + + dnl Set these for checking with the tests below. They'll be restored after + LIBS="$LIBS $XFT_LIBS" + CPPFLAGS="$XFT_CFLAGS $CPPFLAGS" else + dnl This is for Xft version 1 + XFT_LIBS="-lXft" AC_MSG_RESULT([no]) fi @@ -115,8 +125,6 @@ AC_CHECK_LIB([Xft], [XftFontOpenXlfd], ], [ AC_MSG_RESULT([yes]) - dnl This is for Xft version 1 - test "$XFT2" = "yes" || LIBS="$LIBS -lXft" ], [ AC_MSG_RESULT([no]) @@ -126,6 +134,12 @@ See http://www.fontconfig.org/ ] ) ) +dnl Restore the old values. Use XFT_CFLAGS and XFT_LIBS in the Makefile.am's +LIBS=$OLDLIBS +CPPFLAGS=$OLDCPPFLAGS + +AC_SUBST([XFT_CFLAGS]) +AC_SUBST([XFT_LIBS]) dnl Check for XShape extension support AC_CHECK_LIB([Xext], [XShapeCombineShape], |