[Commit] Xft configure.ac,1.11,1.12
Noah Levitt
commit@keithp.com
Tue, 06 May 2003 11:21:23 -0700
Committed by: nlevitt
Update of /local/src/CVS/Xft
In directory home.keithp.com:/tmp/cvs-serv14808
Modified Files:
configure.ac
Log Message:
If Xrender isn't found with pkg-config, check for XRenderFindStandardFormat which, if found, means that the installed version of Xrender is recent enough.
Index: configure.ac
===================================================================
RCS file: /local/src/CVS/Xft/configure.ac,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- configure.ac 6 May 2003 05:37:49 -0000 1.11
+++ configure.ac 6 May 2003 18:21:21 -0000 1.12
@@ -46,7 +46,10 @@
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)
+ yes)
+ XRENDER_LIBS="$XRENDER_LIBS -lXext -lX11"
+ ;;
+ *)
# checks for X
AC_PATH_X
@@ -60,11 +63,8 @@
saved_LIBS="$LIBS"
LIBS="$LIBS $XRENDER_LIBS"
- AC_CHECK_FUNCS([XRenderQueryVersion], [], [AC_MSG_ERROR([libXrender not found.])])
+ AC_CHECK_FUNCS([XRenderFindStandardFormat], [], [AC_MSG_ERROR([libXrender not found or too old.])])
LIBS="$saved_LIBS"
- ;;
- yes)
- XRENDER_LIBS="$XRENDER_LIBS -lXext -lX11"
;;
esac
;;