[Commit] Xft configure.ac,1.9,1.10

[Keith Packard]

Committed by: keithp

Update of /local/src/CVS/Xft
In directory home.keithp.com:/tmp/cvs-serv6999

Modified Files:
	configure.ac 
Log Message:
Make sure -lXext is included for broken Xrender packages


Index: configure.ac
===================================================================
RCS file: /local/src/CVS/Xft/configure.ac,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- configure.ac	1 May 2003 00:48:37 -0000	1.9
+++ configure.ac	6 May 2003 04:44:26 -0000	1.10
@@ -39,25 +39,34 @@
 #
 # Check for Xrender
 #
-PKG_CHECK_MODULES(XRENDER, xrender >= 0, [xrender_found_with_pkgconfig=yes], 
+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)
-        # checks for X
-        AC_PATH_X
+	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
+	no)
+	        # 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([XRenderQueryVersion], [], [AC_MSG_ERROR([libXrender not found.])])
-        LIBS="$saved_LIBS"
+	        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([XRenderQueryVersion], [], [AC_MSG_ERROR([libXrender not found.])])
+	        LIBS="$saved_LIBS"
+		;;
+	yes)
+		XRENDER_LIBS="$XRENDER_LIBS -lXext -lX11"
+		;;
+	esac
         ;;
 esac