diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2011-09-24 21:05:27 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-09-25 11:09:14 -0700 |
| commit | d39337048d31245b69e1b72b98beb957f52ba4e6 (patch) | |
| tree | 4f385621d1e73cc6625c25fc8536779bd2a4a01d | |
| parent | 3ad77b636978746786546ab2b779730997839f63 (diff) | |
Remove broken fallback on non-pkg-config search for libXrender
https://bugs.freedesktop.org/show_bug.cgi?id=5425
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | configure.ac | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/configure.ac b/configure.ac index 54d960f..3847e49 100644 --- a/configure.ac +++ b/configure.ac @@ -64,36 +64,7 @@ AC_SUBST([XFT_LT_VERSION]) # # Check for Xrender # -PKG_CHECK_MODULES(XRENDER, xrender >= 0.8.2, [xrender_found_with_pkgconfig=yes], - [xrender_found_with_pkgconfig=no]) -case "$xrender_found_with_pkgconfig" in -no) - PKG_CHECK_MODULES(XRENDER, xrender >= 0, [old_xrender_found_with_pkgconfig=yes], - [old_xrender_found_with_pkgconfig=no]) - case "$old_xrender_found_with_pkgconfig" in - yes) - XRENDER_LIBS="$XRENDER_LIBS -lXext -lX11" - ;; - *) - # checks for X - AC_PATH_X - - XRENDER_CFLAGS="-I$x_includes" - XRENDER_LIBS="-L$x_libraries -lXrender -lXext -lX11" - - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $XRENDER_CFLAGS" - AC_CHECK_HEADERS([X11/extensions/Xrender.h], [], [AC_MSG_ERROR([Xrender.h not found.])]) - CPPFLAGS="$saved_CPPFLAGS" - - saved_LIBS="$LIBS" - LIBS="$LIBS $XRENDER_LIBS" - AC_CHECK_FUNCS([XRenderFindStandardFormat], [], [AC_MSG_ERROR([libXrender not found or too old.])]) - LIBS="$saved_LIBS" - ;; - esac - ;; -esac +PKG_CHECK_MODULES(XRENDER, xrender >= 0.8.2 xext x11) # Check freetype configuration AC_ARG_WITH(freetype-config, [ --with-freetype-config=PROG Use FreeType configuration program PROG], freetype_config=$withval, freetype_config=auto) |