Xmu ChangeLog,1.6,1.7 configure.ac,1.7,1.8 xmuu.pc.in,1.4,1.5

[Phil Blundell]

Committed by: pb

Update of /cvs/xlibs/Xmu
In directory gabe:/tmp/cvs-serv17065

Modified Files:
	ChangeLog configure.ac xmuu.pc.in 
Log Message:
2005-01-01  Phil Blundell  <philb at gnu.org>

	* configure.ac (XMUU_CFLAGS, XMUU_LIBS): New.
	* xmuu.pc.in: Use XMUU_CFLAGS+XMUU_LIBS, not XMU_CFLAGS+XMU_LIBS.


Index: ChangeLog
===================================================================
RCS file: /cvs/xlibs/Xmu/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ChangeLog	18 May 2004 04:31:58 -0000	1.6
+++ ChangeLog	1 Jan 2005 14:33:20 -0000	1.7
@@ -1,3 +1,8 @@
+2005-01-01  Phil Blundell  <philb at gnu.org>
+
+	* configure.ac (XMUU_CFLAGS, XMUU_LIBS): New.
+	* xmuu.pc.in: Use XMUU_CFLAGS+XMUU_LIBS, not XMU_CFLAGS+XMU_LIBS.
+
 2004-05-17  Eric Anholt  <anholt at FreeBSD.org>
 
 	* EditresCom.c:

Index: configure.ac
===================================================================
RCS file: /cvs/xlibs/Xmu/configure.ac,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- configure.ac	29 Dec 2004 01:48:37 -0000	1.7
+++ configure.ac	1 Jan 2005 14:33:20 -0000	1.8
@@ -28,6 +28,10 @@
 AC_SUBST(XMU_CFLAGS)
 AC_SUBST(XMU_LIBS)
 
+PKG_CHECK_MODULES(XMUU, x11)
+AC_SUBST(XMUU_CFLAGS)
+AC_SUBST(XMUU_LIBS)
+
 AC_OUTPUT([Makefile
            include/Makefile
 	   xmu.pc

Index: xmuu.pc.in
===================================================================
RCS file: /cvs/xlibs/Xmu/xmuu.pc.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- xmuu.pc.in	11 May 2004 06:22:21 -0000	1.4
+++ xmuu.pc.in	1 Jan 2005 14:33:20 -0000	1.5
@@ -6,5 +6,5 @@
 Name: Xmuu
 Description: Mini Xmu Library
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lXmuu @XMU_LIBS@
-Cflags: -I${includedir} @XMU_CFLAGS@
+Libs: -L${libdir} -lXmuu @XMUU_LIBS@
+Cflags: -I${includedir} @XMUU_CFLAGS@