[Commit] Xr Xr.pc.in,1.1,1.2 configure.in,1.1,1.2
commit@keithp.com
commit@keithp.com
Tue, 22 Apr 2003 22:09:01 -0700
Committed by: keithp
Update of /local/src/CVS/Xr
In directory home.keithp.com:/tmp/cvs-serv12814
Modified Files:
Xr.pc.in configure.in
Log Message:
Require proper Xft version
Index: Xr.pc.in
===================================================================
RCS file: /local/src/CVS/Xr/Xr.pc.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Xr.pc.in 17 Apr 2003 20:24:29 -0000 1.1
+++ Xr.pc.in 23 Apr 2003 05:08:58 -0000 1.2
@@ -7,5 +7,5 @@
Description: X Rendeing library
Version: @VERSION@
Requires: Xc
-Libs: -L${libdir} -lXft -lfreetype -lXr -lm
-Cflags: -I${includedir}
+Libs: -L${libdir} -lXr -lm @XR_LIBS@
+Cflags: -I${includedir} @XR_CFLAGS@
Index: configure.in
===================================================================
RCS file: /local/src/CVS/Xr/configure.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- configure.in 17 Apr 2003 20:24:29 -0000 1.1
+++ configure.in 23 Apr 2003 05:08:58 -0000 1.2
@@ -17,6 +17,7 @@
dnl ===========================================================================
XC_REQUIRED=0.1.0
+XFT_REQUIRED=2.1.1
dnl ===========================================================================
@@ -36,8 +37,9 @@
dnl ===========================================================================
-PKG_CHECK_MODULES(XR, \
+PKG_CHECK_MODULES(XR,
Xc >= $XC_REQUIRED
+ xft >= $XFT_REQUIRED
)
AC_SUBST(XR_CFLAGS)
AC_SUBST(XR_LIBS)