diff options
| -rw-r--r-- | configure.ac | 24 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
2 files changed, 21 insertions, 7 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], diff --git a/src/Makefile.am b/src/Makefile.am index a998e93d..6fe76c90 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,12 +2,12 @@ localedir=$(datadir)/locale DEFAULT_MENU=$(pkgdatadir)/menu DEFAULT_STYLE=$(pkgdatadir)/styles/mbdtex -CPPFLAGS=`pkg-config --cflags xft` @CPPFLAGS@ \ +CPPFLAGS=$(XFT_CFLAGS) @CPPFLAGS@ \ -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \ -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \ -DLOCALEDIR=\"$(localedir)\" -LDFLAGS=`pkg-config --libs xft` +LIBS=$(XFT_LIBS) @LIBS@ INCLUDES= -I../otk |