diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2012-08-16 21:48:50 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2012-08-16 22:02:41 -0400 |
| commit | 194b6ee552318ec6c494f34ed9f0979d0460fe4f (patch) | |
| tree | af5b939f4750a4208b58c06b71fe09cdefa144f0 /configure.in | |
| parent | 8168660e5f1906aed2a45d30529058f51473bcef (diff) | |
| download | pango-194b6ee552318ec6c494f34ed9f0979d0460fe4f.tar.gz | |
Remove PangoX
Been overdue...
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/configure.in b/configure.in index fc5a0f76..90ed3c46 100644 --- a/configure.in +++ b/configure.in @@ -225,21 +225,6 @@ AC_ARG_ENABLE(rebuilds, AM_CONDITIONAL(CROSS_COMPILING, [test $cross_compiling = yes]) -have_x=false -if test "x$pango_os_win32" != xyes; then - AC_PATH_XTRA - - if test x$no_x = xyes ; then - AC_MSG_WARN([X development libraries not found]) - have_x=false - else - X_LIBS="$X_LIBS -lX11" - have_x=true - AC_DEFINE(HAVE_X, 1, [Have X libraries]) - fi -fi -AM_CONDITIONAL(HAVE_X, $have_x) - have_fontconfig=false have_freetype=false have_xft=false @@ -268,7 +253,7 @@ AM_CONDITIONAL(HAVE_FREETYPE, $have_freetype) # # Checks for Xft/XRender # -if $have_x && $have_freetype ; then +if $have_freetype ; then PKG_CHECK_MODULES(XFT, xft >= 2.0.0 xrender, have_xft=true, AC_MSG_RESULT([no])) fi if $have_xft ; then @@ -983,14 +968,13 @@ _EOF ]) AC_CONFIG_FILES([ -Makefile +Makefile pango/Makefile pango/mini-fribidi/Makefile pango/pango.rc pango/pangoft2.rc pango/pangowin32.rc pango/pangocairo.rc -pango/pangox.rc pango/pangoxft.rc pango-view/Makefile modules/Makefile @@ -1008,13 +992,11 @@ build/win32/Makefile build/win32/vs9/Makefile build/win32/vs10/Makefile pango.pc -pangox.pc pangowin32.pc pangoft2.pc pangoxft.pc pangocairo.pc pango-uninstalled.pc -pangox-uninstalled.pc pangowin32-uninstalled.pc pangoft2-uninstalled.pc pangoxft-uninstalled.pc |