diff options
| author | Tor Lillqvist <tml@iki.fi> | 2001-10-04 05:57:58 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2001-10-04 05:57:58 +0000 |
| commit | 226cdc6da94ccfc90a5b8596022bc58a0dd1914d (patch) | |
| tree | c7d9568c74d6d2d6bdc0c619f5dce24717aa1d07 /configure.in | |
| parent | 9596fb5dae92c3c3d85473e68b26d43656b41a57 (diff) | |
| download | pango-226cdc6da94ccfc90a5b8596022bc58a0dd1914d.tar.gz | |
Retract my change to Xrender+Xft+Xft+FreeType.h checks from yesterday,
2001-10-04 Tor Lillqvist <tml@iki.fi>
* configure.in: Retract my change to Xrender+Xft+Xft+FreeType.h
checks from yesterday, instead enclose nested AC_CHECK_* calls in
brackets.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/configure.in b/configure.in index 9520f69b..c9ea10cc 100644 --- a/configure.in +++ b/configure.in @@ -129,13 +129,12 @@ if test $have_x = true ; then pango_save_cppflags="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS" - AC_CHECK_LIB(Xrender, XRenderFindFormat, have_lib_xrender = true, have_lib_xrender = false, -lXext $X_LIBS) - if test $have_lib_xrender = true; then - AC_CHECK_LIB(Xft, XftFontOpen, have_lib_xft = true, have_lib_xft = false, -lXrender -lXext $X_LIBS $FREETYPE_LIBS) - if test $have_lib_xft = true; then - AC_CHECK_HEADER(X11/Xft/XftFreetype.h, have_xft=true, :) - fi - fi + 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) CPPFLAGS="$pango_save_cppflags" |