diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-06-04 21:55:29 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-06-04 21:55:29 +0000 |
| commit | 9f224d08e9d82aa0a9c0d7941ebda312ad325ac9 (patch) | |
| tree | e6a7a238091e4c13f852f31cdbb587b523ef1051 /configure.in | |
| parent | 0219cc38d4188b207954faf7d39e383b38918787 (diff) | |
| download | gtk+-9f224d08e9d82aa0a9c0d7941ebda312ad325ac9.tar.gz | |
If we have xft .pc file, use that when checking for Xft/Xrender. (Still
Tue Jun 4 17:39:34 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: If we have xft .pc file, use that
when checking for Xft/Xrender. (Still need to separate
out HAVE_XFT, HAVE_RENDER)
* configure.in: Make sure Xft cflags come before X cflags.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/configure.in b/configure.in index 1dd346e058..ff0dcaca53 100644 --- a/configure.in +++ b/configure.in @@ -987,24 +987,32 @@ if test "x$gdktarget" = "xx11"; then # # Checks for Xft/XRender # - XFT_LIBS="" - XFT_CFLAGS="" if test $have_xft = true ; then - gtk_save_cppflags="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $x_cflags" have_xft=false - AC_CHECK_LIB(Xrender, XRenderFindFormat, - [AC_CHECK_LIB(Xft, XftFontOpen, - [AC_CHECK_HEADER(X11/Xft/XftFreetype.h, - have_xft=true,:)], - :,-lXrender -lXext $x_libs $FREETYPE_LIBS)] - ,:,-lXext $x_libs) + if $PKG_CONFIG --exists xft ; then + x_libs="`pkg-config --libs xft` -lX11 $FREETYPE_LIBS $X_EXTRA_LIBS" + have_xft=true + else + gtk_save_cppflags="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $x_cflags" + + AC_CHECK_LIB(Xrender, XRenderFindFormat, + [AC_CHECK_LIB(Xft, XftFontOpen, + [AC_CHECK_HEADER(X11/Xft/XftFreetype.h, + have_xft=true,:)], + :,-lXrender -lXext $x_libs $FREETYPE_LIBS)] + ,:,-lXext $x_libs) + + if $have_xft ; then + x_libs="$X_LIBS -lXft -lXrender -lXext -lX11 $FREETYPE_LIBS $X_EXTRA_LIBS" + fi - CPPFLAGS="$gtk_save_cppflags" + CPPFLAGS="$gtk_save_cppflags" + fi if $have_xft ; then - x_libs="$X_LIBS -lXft -lXrender -lXext -lX11 $FREETYPE_LIBS $X_EXTRA_LIBS" + : else AC_MSG_ERROR([pangoxft Pango backend found, but Xft not found]) fi @@ -1271,7 +1279,7 @@ fi if test "x$gdktarget" = "xx11"; then if $have_xft = true ; then - PANGO_PACKAGES="pangox pangoxft" + PANGO_PACKAGES="pangoxft pangox" else PANGO_PACKAGES=pangox fi |