[PATCH libXft] Remove broken fallback on non-pkg-config search for libXrender (was [PATCH]...)

[Gaetan Nadon]

On Sat, 2011-09-24 at 21:09 -0700, Jeremy Huddleston wrote:

> https://bugs.freedesktop.org/show_bug.cgi?id=5425
> 
> Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
> ---
>  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)


Reviewed-by: Gaetan Nadon <memsize at videotron.ca>

Perhaps the subject of another patch, ldd -r -u reports:

        Unused direct dependencies:
        	
        	/home/nadon/xorg/src/inst/lib/libXext.so.6



-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.x.org/archives/xorg-devel/attachments/20110925/2695b8f9/attachment.htm>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL: <http://lists.x.org/archives/xorg-devel/attachments/20110925/2695b8f9/attachment.pgp>