diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-12-15 01:10:13 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-12-15 01:10:13 +0000 |
| commit | f2bb9b92d5cebe5594e73e2eeea8a1a606da9005 (patch) | |
| tree | 0eb5ddbd7f3c77b799603fcc21e444f6d9941d6c /configure.in | |
| parent | 016c4d7047fd3ac2f76667f4ffe3b3a22ad0b902 (diff) | |
| download | pango-f2bb9b92d5cebe5594e73e2eeea8a1a606da9005.tar.gz | |
Fix macro breakage.
Thu Dec 14 19:00:46 2000 Owen Taylor <otaylor@redhat.com>
* modules/indic/pango-indic-script.h: Fix macro breakage.
* modules/basic/tables-big.i: Remove extra copy of basic_ranges.
* modules/thai/thai.c: Fix various warnings.
* configure.in Makefile.am pangoxft.pc.in pango-config.in
modules/basic/Makefile.am modules/basic/basic-xft.c
pango/Makefile.am pango/pangoxft-font.[ch] pango/pangoxft-fontmap.c
pango/pangoxft.h pango/pangoxft-private.h: Initial support
for rendering via Xft and the Xrender extension.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 09678255..a4cffeeb 100644 --- a/configure.in +++ b/configure.in @@ -23,13 +23,33 @@ if test "x$GCC" = "xyes"; then fi changequote([,])dnl -AC_PATH_X +AC_PATH_XTRA + if test x$no_x = xyes ; then AC_MSG_ERROR([X development libraries not found]) -fi -X_LIBS="-L$x_libraries -lX11" -AC_SUBST(X_LIBS) +fi + +X_LIBS="$X_LIBS -lX11" + +# +# Checks for Xft/XRender +# +have_xft=false +XFT_LIBS="" +AC_CHECK_LIB(Xrender, XRenderFindFormat, + AC_CHECK_LIB(Xft, XftFontOpen, have_xft=true, :, -lXrender $X_LIBS) +,:,-lXext $X_LIBS) + +if $have_xft = 'true' ; then + XFT_LIBS="-lXft -lXrender -lXext $X_LIBS" +fi + +AC_SUBST(XFT_LIBS) +AM_CONDITIONAL(HAVE_XFT, $have_xft) +# +# Checks for GLib +# AM_PATH_GLIB_2_0(1.3.1,, AC_MSG_ERROR([GLib 1.3.1 is required for building Pango]), gmodule gobject) @@ -292,6 +312,7 @@ pango.spec pango-config pango.pc pangox.pc +pangoxft.pc ],[case "$CONFIG_FILES" in *pango-config*)chmod +x pango-config;; esac]) |