Index: FS/libfs.pc.in
===================================================================
RCS file: /cvs/xorg/lib/FS/libfs.pc.in,v
retrieving revision 1.2
diff -u -p -r1.2 libfs.pc.in
--- FS/libfs.pc.in	3 Aug 2005 03:28:00 -0000	1.2
+++ FS/libfs.pc.in	29 Sep 2005 20:32:39 -0000
@@ -6,5 +6,6 @@ includedir=@includedir@
 Name: libFS
 Description: Library Interface to the X Font Server
 Version: @PACKAGE_VERSION@
-Cflags: -I${includedir} @FS_CFLAGS@
-Libs: -L${libdir} -lFS @FS_LIBS@
+Requires: xproto fontsproto
+Cflags: -I${includedir}
+Libs: -L${libdir} -lFS
Index: ICE/ice.pc.in
===================================================================
RCS file: /cvs/xorg/lib/ICE/ice.pc.in,v
retrieving revision 1.1
diff -u -p -r1.1 ice.pc.in
--- ICE/ice.pc.in	17 May 2005 20:52:35 -0000	1.1
+++ ICE/ice.pc.in	29 Sep 2005 20:32:39 -0000
@@ -6,5 +6,6 @@ includedir=@includedir@
 Name: ICE
 Description: X Inter Client Exchange Library
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lICE @ICE_LIBS@
-Cflags: -I${includedir} @ICE_CFLAGS@
+Requires: xproto
+Libs: -L${libdir} -lICE
+Cflags: -I${includedir}
Index: SM/sm.pc.in
===================================================================
RCS file: /cvs/xorg/lib/SM/sm.pc.in,v
retrieving revision 1.1
diff -u -p -r1.1 sm.pc.in
--- SM/sm.pc.in	17 May 2005 21:25:15 -0000	1.1
+++ SM/sm.pc.in	29 Sep 2005 20:32:39 -0000
@@ -6,5 +6,6 @@ includedir=@includedir@
 Name: SM
 Description: X Session Management Library
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lSM @SM_LIBS@
-Cflags: -I${includedir} @SM_CFLAGS@
+Requires: ice xproto
+Libs: -L${libdir} -lSM
+Cflags: -I${includedir}
Index: X11/x11.pc.in
===================================================================
RCS file: /cvs/xorg/lib/X11/x11.pc.in,v
retrieving revision 1.3
diff -u -p -r1.3 x11.pc.in
--- X11/x11.pc.in	24 Sep 2005 00:16:32 -0000	1.3
+++ X11/x11.pc.in	29 Sep 2005 20:32:39 -0000
@@ -8,5 +8,6 @@ xthreadlib=@XTHREADLIB@
 Name: X11
 Description: X Library
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lX11 @XPROTO_LIBS@ @LIBS@
-Cflags: -I${includedir} @XPROTO_CFLAGS@ @XTHREAD_CFLAGS@
+Requires: xproto
+Libs: -L${libdir} -lX11 @LIBS@
+Cflags: -I${includedir} @XTHREAD_CFLAGS@
Index: XRes/configure.ac
===================================================================
RCS file: /cvs/xorg/lib/XRes/configure.ac,v
retrieving revision 1.3
diff -u -p -r1.3 configure.ac
--- XRes/configure.ac	29 Jul 2005 21:22:50 -0000	1.3
+++ XRes/configure.ac	29 Sep 2005 20:32:40 -0000
@@ -50,6 +50,7 @@ AC_SUBST(XRES_LIBS)
 # find the required protocol version
 
 RES_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
+AC_SUBST(RES_VERSION)
 PKG_CHECK_MODULES(RESOURCEEXT, resourceproto >= $RES_VERSION)
 
 AC_SUBST(RESOURCEEXT_CFLAGS)
Index: XRes/xres.pc.in
===================================================================
RCS file: /cvs/xorg/lib/XRes/xres.pc.in,v
retrieving revision 1.1
diff -u -p -r1.1 xres.pc.in
--- XRes/xres.pc.in	7 Jun 2005 18:51:22 -0000	1.1
+++ XRes/xres.pc.in	29 Sep 2005 20:32:40 -0000
@@ -6,5 +6,6 @@ includedir=@includedir@
 Name: XRes
 Description: X Resource Information Extension Library
 Version: @VERSION@
-Cflags: -I${includedir} @RESOURCEEXT_CFLAGS@ @XRES_CFLAGS@
-Libs: -L${libdir} -lXRes @RESOURCEEXT_LIBS@ @XRES_LIBS@
+Requires: resourceproto >= @RES_VERSION@ x11 xext
+Cflags: -I${includedir}
+Libs: -L${libdir} -lXRes
Index: XScrnSaver/xscrnsaver.pc.in
===================================================================
RCS file: /cvs/xorg/lib/XScrnSaver/xscrnsaver.pc.in,v
retrieving revision 1.3
diff -u -p -r1.3 xscrnsaver.pc.in
--- XScrnSaver/xscrnsaver.pc.in	28 Aug 2005 19:59:15 -0000	1.3
+++ XScrnSaver/xscrnsaver.pc.in	29 Sep 2005 20:32:40 -0000
@@ -6,5 +6,6 @@ includedir=@includedir@
 Name: XScrnSaver
 Description: The XScrnSaver Library
 Version: @PACKAGE_VERSION@
-Cflags: -I${includedir} @XSCRNSAVER_CFLAGS@
-Libs: -L${libdir} -lXss @XSCRNSAVER_LIBS@
+Requires: x11 xext xextproto scrnsaverproto
+Cflags: -I${includedir}
+Libs: -L${libdir} -lXss
Index: XTrap/xtrap.pc.in
===================================================================
RCS file: /cvs/xorg/lib/XTrap/xtrap.pc.in,v
retrieving revision 1.3
diff -u -p -r1.3 xtrap.pc.in
--- XTrap/xtrap.pc.in	3 Aug 2005 03:28:00 -0000	1.3
+++ XTrap/xtrap.pc.in	29 Sep 2005 20:32:40 -0000
@@ -6,5 +6,6 @@ includedir=@includedir@
 Name: XTrap
 Description: X Trap Library
 Version: @PACKAGE_VERSION@
-Cflags: -I${includedir} @XTRAP_CFLAGS@
-Libs: -L${libdir} -lXTrap @XTRAP_LIBS@
+Requires: x11 xt trapproto xext xextproto
+Cflags: -I${includedir}
+Libs: -L${libdir} -lXTrap
Index: Xau/xau.pc.in
===================================================================
RCS file: /cvs/xorg/lib/Xau/xau.pc.in,v
retrieving revision 1.1
diff -u -p -r1.1 xau.pc.in
--- Xau/xau.pc.in	9 May 2005 22:04:21 -0000	1.1
+++ Xau/xau.pc.in	29 Sep 2005 20:32:40 -0000
@@ -6,5 +6,6 @@ includedir=@includedir@
 Name: Xau
 Description: X authorization file management libary
 Version: @PACKAGE_VERSION@
+Requires: xproto
 Libs: -L${libdir} -lXau
 Cflags: -I${includedir}
Index: Xaw/xaw6.pc.in
===================================================================
RCS file: /cvs/xorg/lib/Xaw/xaw6.pc.in,v
retrieving revision 1.2
diff -u -p -r1.2 xaw6.pc.in
--- Xaw/xaw6.pc.in	24 Jun 2005 21:20:30 -0000	1.2
+++ Xaw/xaw6.pc.in	29 Sep 2005 20:32:40 -0000
@@ -6,5 +6,6 @@ includedir=@includedir@
 Name: Xaw
 Description: X Athena Widgets Library, version 6
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lXaw6 @XAW6_LIBS@
-Cflags: -I${includedir} @XAW6_CFLAGS@
+Requires: xproto x11 xt xmu xpm
+Libs: -L${libdir} -lXaw6
+Cflags: -I${includedir}
Index: Xaw/xaw7.pc.in
===================================================================
RCS file: /cvs/xorg/lib/Xaw/xaw7.pc.in,v
retrieving revision 1.2
diff -u -p -r1.2 xaw7.pc.in
--- Xaw/xaw7.pc.in	24 Jun 2005 21:20:30 -0000	1.2
+++ Xaw/xaw7.pc.in	29 Sep 2005 20:32:40 -0000
@@ -6,5 +6,6 @@ includedir=@includedir@
 Name: Xaw
 Description: X Athena Widgets Library, version 7
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lXaw7 @XAW7_LIBS@
-Cflags: -I${includedir} @XAW7_CFLAGS@
+Requires: xproto x11 xt xmu xpm
+Libs: -L${libdir} -lXaw7
+Cflags: -I${includedir}
Index: Xaw/xaw8.pc.in
===================================================================
RCS file: /cvs/xorg/lib/Xaw/xaw8.pc.in,v
retrieving revision 1.2
diff -u -p -r1.2 xaw8.pc.in
--- Xaw/xaw8.pc.in	24 Jun 2005 21:20:30 -0000	1.2
+++ Xaw/xaw8.pc.in	29 Sep 2005 20:32:40 -0000
@@ -6,5 +6,6 @@ includedir=@includedir@
 Name: Xaw
 Description: X Athena Widgets Library
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lXaw8 @XAW8_LIBS@
-Cflags: -I${includedir} @XAW8_CFLAGS@
+Requires: xproto x11 xt xmu xpm xp
+Libs: -L${libdir} -lXaw8
+Cflags: -I${includedir}
Index: Xcomposite/configure.ac
===================================================================
RCS file: /cvs/xorg/lib/Xcomposite/configure.ac,v
retrieving revision 1.5
diff -u -p -r1.5 configure.ac
--- Xcomposite/configure.ac	3 Aug 2005 03:28:01 -0000	1.5
+++ Xcomposite/configure.ac	29 Sep 2005 20:32:40 -0000
@@ -51,6 +51,7 @@ if test "$VERSION" = "" ; then
        VERSION=$PACKAGE_VERSION;
 fi
 COMPOSITEEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
+AC_SUBST(COMPOSITEEXT_VERSION)
 PKG_CHECK_MODULES(XCOMPOSITE, [compositeproto >= $COMPOSITEEXT_VERSION] x11 xfixes xext)
 AC_SUBST(XCOMPOSITE_CFLAGS)
 AC_SUBST(XCOMPOSITE_LIBS)
Index: Xcomposite/xcomposite.pc.in
===================================================================
RCS file: /cvs/xorg/lib/Xcomposite/xcomposite.pc.in,v
retrieving revision 1.3
diff -u -p -r1.3 xcomposite.pc.in
--- Xcomposite/xcomposite.pc.in	3 Aug 2005 03:28:01 -0000	1.3
+++ Xcomposite/xcomposite.pc.in	29 Sep 2005 20:32:40 -0000
@@ -6,5 +6,6 @@ includedir=@includedir@
 Name: Xcomposite
 Description: X Composite  Library
 Version: @PACKAGE_VERSION@
-Cflags: -I${includedir} @XCOMPOSITE_CFLAGS@
-Libs: -L${libdir} -lXcomposite @XCOMPOSITE_LIBS@
+Requires: compositeproto >= @COMPOSITEEXT_VERSION@ x11 xfixes xext
+Cflags: -I${includedir}
+Libs: -L${libdir} -lXcomposite
Index: Xcursor/xcursor.pc.in
===================================================================
RCS file: /cvs/xorg/lib/Xcursor/xcursor.pc.in,v
retrieving revision 1.3
diff -u -p -r1.3 xcursor.pc.in
--- Xcursor/xcursor.pc.in	3 Aug 2005 03:28:01 -0000	1.3
+++ Xcursor/xcursor.pc.in	29 Sep 2005 20:32:41 -0000
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: Xcursor
 Description: X Cursor Library
 Version: @VERSION@
-Requires: xrender
-Cflags: -I${includedir} @XCURSOR_CFLAGS@
-Libs: -L${libdir} -lXcursor @XCURSOR_LIBS@
+Requires: xrender xfixes x11
+Cflags: -I${includedir}
+Libs: -L${libdir} -lXcursor
Index: Xdamage/configure.ac
===================================================================
RCS file: /cvs/xorg/lib/Xdamage/configure.ac,v
retrieving revision 1.5
diff -u -p -r1.5 configure.ac
--- Xdamage/configure.ac	29 Jul 2005 21:22:51 -0000	1.5
+++ Xdamage/configure.ac	29 Sep 2005 20:32:41 -0000
@@ -85,6 +85,7 @@ fi
 # find the required protocol version
 
 DAMAGEEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
+AC_SUBST(DAMAGEEXT_VERSION)
 PKG_CHECK_MODULES(XDAMAGE, [damageproto >= $DAMAGEEXT_VERSION] xfixes)
 AC_SUBST(XDAMAGE_CFLAGS)
 
Index: Xdamage/xdamage.pc.in
===================================================================
RCS file: /cvs/xorg/lib/Xdamage/xdamage.pc.in,v
retrieving revision 1.1
diff -u -p -r1.1 xdamage.pc.in
--- Xdamage/xdamage.pc.in	17 May 2005 16:47:59 -0000	1.1
+++ Xdamage/xdamage.pc.in	29 Sep 2005 20:32:41 -0000
@@ -6,5 +6,6 @@ includedir=@includedir@
 Name: Xdamage
 Description: X Damage  Library
 Version: @PACKAGE_VERSION@
-Cflags: -I${includedir} @XDAMAGE_CFLAGS@ @X_CFLAGS@
-Libs: -L${libdir} -lXdamage @XDAMAGE_LIBS@ @X_LIBS@
+Requires: damageproto >= @DAMAGEEXT_VERSION@ xfixes
+Cflags: -I${includedir} @X_CFLAGS@
+Libs: -L${libdir} -lXdamage @X_LIBS@
Index: Xdmcp/xdmcp.pc.in
===================================================================
RCS file: /cvs/xorg/lib/Xdmcp/xdmcp.pc.in,v
retrieving revision 1.1
diff -u -p -r1.1 xdmcp.pc.in
--- Xdmcp/xdmcp.pc.in	12 May 2005 16:12:34 -0000	1.1
+++ Xdmcp/xdmcp.pc.in	29 Sep 2005 20:32:41 -0000
@@ -6,5 +6,6 @@ includedir=@includedir@
 Name: Xdmcp
 Description: X Display Manager Control Protocol library
 Version: @PACKAGE_VERSION@
+Requires: xproto
 Libs: -L${libdir} -lXdmcp
 Cflags: -I${includedir}
Index: Xext/xext.pc.in
===================================================================
RCS file: /cvs/xorg/lib/Xext/xext.pc.in,v
retrieving revision 1.1
diff -u -p -r1.1 xext.pc.in
--- Xext/xext.pc.in	18 May 2005 18:50:23 -0000	1.1
+++ Xext/xext.pc.in	29 Sep 2005 20:32:41 -0000
@@ -6,5 +6,6 @@ includedir=@includedir@
 Name: Xext
 Description: Misc X Extension Library
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lXext @XEXT_LIBS@
-Cflags: -I${includedir} @XEXT_CFLAGS@
+Requires: xproto x11 xextproto
+Libs: -L${libdir} -lXext
+Cflags: -I${includedir}
Index: Xfixes/configure.ac
===================================================================
RCS file: /cvs/xorg/lib/Xfixes/configure.ac,v
retrieving revision 1.5
diff -u -p -r1.5 configure.ac
--- Xfixes/configure.ac	29 Jul 2005 21:22:51 -0000	1.5
+++ Xfixes/configure.ac	29 Sep 2005 20:32:41 -0000
@@ -54,6 +54,7 @@ AC_SUBST(X_LIBS)
 # find the required protocol version
 
 FIXESEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
+AC_SUBST(FIXESEXT_VERSION)
 PKG_CHECK_MODULES(FIXESEXT, [fixesproto >= $FIXESEXT_VERSION])
 AC_SUBST(FIXESEXT_CFLAGS)
 AC_SUBST(FIXESEXT_LIBS)
Index: Xfixes/xfixes.pc.in
===================================================================
RCS file: /cvs/xorg/lib/Xfixes/xfixes.pc.in,v
retrieving revision 1.1
diff -u -p -r1.1 xfixes.pc.in
--- Xfixes/xfixes.pc.in	17 May 2005 15:21:14 -0000	1.1
+++ Xfixes/xfixes.pc.in	29 Sep 2005 20:32:41 -0000
@@ -6,5 +6,6 @@ includedir=@includedir@
 Name: Xfixes
 Description: X Fixes  Library
 Version: @PACKAGE_VERSION@
-Cflags: -I${includedir} @X_CFLAGS@
-Libs: -L${libdir} -lXfixes @X_LIBS@
+Requires: x11 fixesproto >= @FIXESEXT_VERSION@
+Cflags: -I${includedir}
+Libs: -L${libdir} -lXfixes
Index: Xfontcache/xfontcache.pc.in
===================================================================
RCS file: /cvs/xorg/lib/Xfontcache/xfontcache.pc.in,v
retrieving revision 1.2
diff -u -p -r1.2 xfontcache.pc.in
--- Xfontcache/xfontcache.pc.in	3 Aug 2005 03:28:01 -0000	1.2
+++ Xfontcache/xfontcache.pc.in	29 Sep 2005 20:32:41 -0000
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: Xfontcache
 Description: The Xfontcache Library
 Version: @PACKAGE_VERSION@
-Cflags: -I${includedir} @XFONTCACHE_CFLAGS@
-Libs: -L${libdir} -lXfontcache @XFONTCACHE_LIBS@
-
+Requires: x11 xext xextproto fontcacheproto
+Cflags: -I${includedir}
+Libs: -L${libdir} -lXfontcache
Index: Xi/xi.pc.in
===================================================================
RCS file: /cvs/xorg/lib/Xi/xi.pc.in,v
retrieving revision 1.2
diff -u -p -r1.2 xi.pc.in
--- Xi/xi.pc.in	1 Jul 2005 20:09:11 -0000	1.2
+++ Xi/xi.pc.in	29 Sep 2005 20:32:41 -0000
@@ -6,5 +6,6 @@ includedir=@includedir@
 Name: Xi
 Description: X Input Extension Library
 Version: @VERSION@
-Cflags: -I${includedir} @XI_CFLAGS@
-Libs: -L${libdir} -lXi @XI_LIBS@
+Requires: xproto x11 xextproto xext inputproto
+Cflags: -I${includedir}
+Libs: -L${libdir} -lXi
Index: Xinerama/xinerama.pc.in
===================================================================
RCS file: /cvs/xorg/lib/Xinerama/xinerama.pc.in,v
retrieving revision 1.2
diff -u -p -r1.2 xinerama.pc.in
--- Xinerama/xinerama.pc.in	3 Aug 2005 03:28:01 -0000	1.2
+++ Xinerama/xinerama.pc.in	29 Sep 2005 20:32:41 -0000
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: Xinerama
 Description: The Xinerama Library
 Version: @PACKAGE_VERSION@
-Cflags: -I${includedir} @XINERAMA_CFLAGS@
-Libs: -L${libdir} -lXinerama @XINERAMA_LIBS@
-
+Requires: x11 xext xextproto xineramaproto
+Cflags: -I${includedir}
+Libs: -L${libdir} -lXinerama
Index: Xmu/xmu.pc.in
===================================================================
RCS file: /cvs/xorg/lib/Xmu/xmu.pc.in,v
retrieving revision 1.1
diff -u -p -r1.1 xmu.pc.in
--- Xmu/xmu.pc.in	18 May 2005 19:38:35 -0000	1.1
+++ Xmu/xmu.pc.in	29 Sep 2005 20:32:41 -0000
@@ -6,5 +6,6 @@ includedir=@includedir@
 Name: Xmu
 Description: Xmu Library
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lXmu @XMU_LIBS@
-Cflags: -I${includedir} @XMU_CFLAGS@
+Requires: xt xext
+Libs: -L${libdir} -lXmu
+Cflags: -I${includedir}
Index: Xmu/xmuu.pc.in
===================================================================
RCS file: /cvs/xorg/lib/Xmu/xmuu.pc.in,v
retrieving revision 1.1
diff -u -p -r1.1 xmuu.pc.in
--- Xmu/xmuu.pc.in	18 May 2005 19:38:35 -0000	1.1
+++ Xmu/xmuu.pc.in	29 Sep 2005 20:32:41 -0000
@@ -6,5 +6,6 @@ includedir=@includedir@
 Name: Xmuu
 Description: Mini Xmu Library
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lXmuu @XMUU_LIBS@
-Cflags: -I${includedir} @XMUU_CFLAGS@
+Requires: x11
+Libs: -L${libdir} -lXmuu
+Cflags: -I${includedir}
Index: Xp/xp.pc.in
===================================================================
RCS file: /cvs/xorg/lib/Xp/xp.pc.in,v
retrieving revision 1.2
diff -u -p -r1.2 xp.pc.in
--- Xp/xp.pc.in	27 Jun 2005 16:09:13 -0000	1.2
+++ Xp/xp.pc.in	29 Sep 2005 20:32:41 -0000
@@ -6,5 +6,6 @@ includedir=@includedir@
 Name: Xp
 Description: X Print Library
 Version: @PACKAGE_VERSION@
-Cflags: -I${includedir} @XPRINT_CFLAGS@
-Libs: -L${libdir} -lXp @XPRINT_LIBS@
+Requires: x11 xext xau printproto
+Cflags: -I${includedir}
+Libs: -L${libdir} -lXp
Index: Xpm/xpm.pc.in
===================================================================
RCS file: /cvs/xorg/lib/Xpm/xpm.pc.in,v
retrieving revision 1.1
diff -u -p -r1.1 xpm.pc.in
--- Xpm/xpm.pc.in	19 May 2005 15:02:47 -0000	1.1
+++ Xpm/xpm.pc.in	29 Sep 2005 20:32:41 -0000
@@ -6,5 +6,6 @@ includedir=@includedir@
 Name: Xpm
 Description: X Pixmap Library
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lXpm @XPM_LIBS@ @LIBS@
-Cflags: -I${includedir} @XPM_CFLAGS@
+Requires: xproto x11
+Libs: -L${libdir} -lXpm @LIBS@
+Cflags: -I${includedir}
Index: XprintAppUtil/xprintapputil.pc.in
===================================================================
RCS file: /cvs/xorg/lib/XprintAppUtil/xprintapputil.pc.in,v
retrieving revision 1.2
diff -u -p -r1.2 xprintapputil.pc.in
--- XprintAppUtil/xprintapputil.pc.in	3 Aug 2005 03:28:01 -0000	1.2
+++ XprintAppUtil/xprintapputil.pc.in	29 Sep 2005 20:32:41 -0000
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: XprintAppUtil
 Description: The XprintAppUtil Library
 Version: @PACKAGE_VERSION@
-Cflags: -I${includedir} @XPRINTAPPUTIL_CFLAGS@
-Libs: -L${libdir} -lXprintAppUtil @XPRINTAPPUTIL_LIBS@
-
+Requires: x11 xp xprintutil
+Cflags: -I${includedir}
+Libs: -L${libdir} -lXprintAppUtil
Index: XprintUtil/xprintutil.pc.in
===================================================================
RCS file: /cvs/xorg/lib/XprintUtil/xprintutil.pc.in,v
retrieving revision 1.2
diff -u -p -r1.2 xprintutil.pc.in
--- XprintUtil/xprintutil.pc.in	3 Aug 2005 03:28:02 -0000	1.2
+++ XprintUtil/xprintutil.pc.in	29 Sep 2005 20:32:41 -0000
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: XprintUtil
 Description: The XprintUtil Library
 Version: @PACKAGE_VERSION@
-Cflags: -I${includedir} @XPRINTUTIL_CFLAGS@
-Libs: -L${libdir} -lXprintUtil @XPRINTUTIL_LIBS@
-
+Requires: x11 xp xprintutil
+Cflags: -I${includedir}
+Libs: -L${libdir} -lXprintUtil
Index: Xrandr/configure.ac
===================================================================
RCS file: /cvs/xorg/lib/Xrandr/configure.ac,v
retrieving revision 1.4
diff -u -p -r1.4 configure.ac
--- Xrandr/configure.ac	29 Jul 2005 21:22:52 -0000	1.4
+++ Xrandr/configure.ac	29 Sep 2005 20:32:41 -0000
@@ -50,6 +50,7 @@ PKG_CHECK_MODULES(X, x11)
 # find the required protocol version
 
 RANDR_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
+AC_SUBST(RANDR_VERSION)
 PKG_CHECK_MODULES(RANDR, randrproto >= $RANDR_VERSION xext xrender renderproto)
 
 XORG_RELEASE_VERSION
Index: Xrandr/xrandr.pc.in
===================================================================
RCS file: /cvs/xorg/lib/Xrandr/xrandr.pc.in,v
retrieving revision 1.1
diff -u -p -r1.1 xrandr.pc.in
--- Xrandr/xrandr.pc.in	8 Jun 2005 17:48:03 -0000	1.1
+++ Xrandr/xrandr.pc.in	29 Sep 2005 20:32:41 -0000
@@ -6,5 +6,6 @@ includedir=@includedir@
 Name: Xrandr
 Description: X RandR Library
 Version: @VERSION@
-Cflags: -I${includedir} @RANDR_CFLAGS@ @X_CFLAGS@
-Libs: -L${libdir} -lXrandr @RANDR_LIBS@ @X_LIBS@
+Requires: randrproto >= @RANDR_VERSION@ xext xrender renderproto x11
+Cflags: -I${includedir}
+Libs: -L${libdir} -lXrandr
Index: Xt/xt.pc.in
===================================================================
RCS file: /cvs/xorg/lib/Xt/xt.pc.in,v
retrieving revision 1.1
diff -u -p -r1.1 xt.pc.in
--- Xt/xt.pc.in	18 May 2005 15:38:28 -0000	1.1
+++ Xt/xt.pc.in	29 Sep 2005 20:32:41 -0000
@@ -6,5 +6,6 @@ includedir=@includedir@
 Name: Xt
 Description: X Toolkit Library
 Version: @VERSION@
-Cflags: -I${includedir} @XT_CFLAGS@
-Libs: -L${libdir} -lXt @XT_LIBS@
+Requires: sm x11 xproto
+Cflags: -I${includedir}
+Libs: -L${libdir} -lXt
Index: Xtst/xtst.pc.in
===================================================================
RCS file: /cvs/xorg/lib/Xtst/xtst.pc.in,v
retrieving revision 1.2
diff -u -p -r1.2 xtst.pc.in
--- Xtst/xtst.pc.in	3 Aug 2005 03:28:02 -0000	1.2
+++ Xtst/xtst.pc.in	29 Sep 2005 20:32:41 -0000
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: Xtst
 Description: The Xtst Library
 Version: @PACKAGE_VERSION@
-Cflags: -I${includedir} @XTST_CFLAGS@
-Libs: -L${libdir} -lXtst @XTST_LIBS@
-
+Requires: x11 xext recordproto xextproto
+Cflags: -I${includedir} 
+Libs: -L${libdir} -lXtst
Index: Xv/xv.pc.in
===================================================================
RCS file: /cvs/xorg/lib/Xv/xv.pc.in,v
retrieving revision 1.2
diff -u -p -r1.2 xv.pc.in
--- Xv/xv.pc.in	3 Aug 2005 03:28:02 -0000	1.2
+++ Xv/xv.pc.in	29 Sep 2005 20:32:42 -0000
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: Xv
 Description: The Xv Library
 Version: @PACKAGE_VERSION@
-Cflags: -I${includedir} @XV_CFLAGS@
-Libs: -L${libdir} -lXv @XV_LIBS@
-
+Requires: x11 xext xextproto videoproto
+Cflags: -I${includedir}
+Libs: -L${libdir} -lXv
Index: XvMC/xvmc.pc.in
===================================================================
RCS file: /cvs/xorg/lib/XvMC/xvmc.pc.in,v
retrieving revision 1.2
diff -u -p -r1.2 xvmc.pc.in
--- XvMC/xvmc.pc.in	3 Aug 2005 03:28:02 -0000	1.2
+++ XvMC/xvmc.pc.in	29 Sep 2005 20:32:42 -0000
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: XvMC
 Description: The XvMC Library
 Version: @PACKAGE_VERSION@
-Cflags: -I${includedir} @XVMC_CFLAGS@
-Libs: -L${libdir} -lXvMC @XVMC_LIBS@
-
+Requires: x11 xext xv xextproto videoproto
+Cflags: -I${includedir}
+Libs: -L${libdir} -lXvMC
Index: Xxf86dga/xxf86dga.pc.in
===================================================================
RCS file: /cvs/xorg/lib/Xxf86dga/xxf86dga.pc.in,v
retrieving revision 1.1
diff -u -p -r1.1 xxf86dga.pc.in
--- Xxf86dga/xxf86dga.pc.in	10 Jun 2005 22:38:47 -0000	1.1
+++ Xxf86dga/xxf86dga.pc.in	29 Sep 2005 20:32:42 -0000
@@ -6,5 +6,6 @@ includedir=@includedir@
 Name: Xxf86dga
 Description: XFree86 Direct Graphics Access Extension Library
 Version: @VERSION@
-Cflags: -I${includedir} @XXF86DGA_CFLAGS@
-Libs: -L${libdir} -lXxf86dga @XXF86DGA_LIBS@
+Requires: xproto x11 xextproto xext xf86dgaproto
+Cflags: -I${includedir}
+Libs: -L${libdir} -lXxf86dga
Index: Xxf86misc/xxf86misc.pc.in
===================================================================
RCS file: /cvs/xorg/lib/Xxf86misc/xxf86misc.pc.in,v
retrieving revision 1.1
diff -u -p -r1.1 xxf86misc.pc.in
--- Xxf86misc/xxf86misc.pc.in	10 Jun 2005 22:38:47 -0000	1.1
+++ Xxf86misc/xxf86misc.pc.in	29 Sep 2005 20:32:42 -0000
@@ -6,5 +6,6 @@ includedir=@includedir@
 Name: Xxf86misc
 Description: XFree86 Misc Extension Library
 Version: @VERSION@
-Cflags: -I${includedir} @XXF86MISC_CFLAGS@
-Libs: -L${libdir} -lXxf86misc @XXF86MISC_LIBS@
+Requires: xproto x11 xextproto xext xf86miscproto
+Cflags: -I${includedir}
+Libs: -L${libdir} -lXxf86misc
Index: Xxf86vm/xxf86vm.pc.in
===================================================================
RCS file: /cvs/xorg/lib/Xxf86vm/xxf86vm.pc.in,v
retrieving revision 1.1
diff -u -p -r1.1 xxf86vm.pc.in
--- Xxf86vm/xxf86vm.pc.in	10 Jun 2005 22:38:47 -0000	1.1
+++ Xxf86vm/xxf86vm.pc.in	29 Sep 2005 20:32:42 -0000
@@ -6,5 +6,6 @@ includedir=@includedir@
 Name: Xxf86vm
 Description: XFree86 Video Mode Extension Library
 Version: @VERSION@
-Cflags: -I${includedir} @XXF86VM_CFLAGS@
-Libs: -L${libdir} -lXxf86vm @XXF86VM_LIBS@
+Requires: xproto x11 xextproto xext xf86vidmodeproto
+Cflags: -I${includedir}
+Libs: -L${libdir} -lXxf86vm
Index: dmx/dmx.pc.in
===================================================================
RCS file: /cvs/xorg/lib/dmx/dmx.pc.in,v
retrieving revision 1.2
diff -u -p -r1.2 dmx.pc.in
--- dmx/dmx.pc.in	3 Aug 2005 03:28:03 -0000	1.2
+++ dmx/dmx.pc.in	29 Sep 2005 20:32:42 -0000
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: dmx
 Description: The dmx Library
 Version: @PACKAGE_VERSION@
-Cflags: -I${includedir} @DMX_CFLAGS@
-Libs: -L${libdir} -ldmx @DMX_LIBS@
-
+Requires: x11 xext xextproto dmxproto
+Cflags: -I${includedir}
+Libs: -L${libdir} -ldmx
Index: fontenc/fontenc.pc.in
===================================================================
RCS file: /cvs/xorg/lib/fontenc/fontenc.pc.in,v
retrieving revision 1.2
diff -u -p -r1.2 fontenc.pc.in
--- fontenc/fontenc.pc.in	3 Aug 2005 03:28:03 -0000	1.2
+++ fontenc/fontenc.pc.in	29 Sep 2005 20:32:42 -0000
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: fontenc
 Description: The fontenc Library
 Version: @PACKAGE_VERSION@
-Cflags: -I${includedir} @FONTENC_CFLAGS@
-Libs: -L${libdir} -lfontenc @FONTENC_LIBS@
-
+Requires: xproto
+Cflags: -I${includedir}
+Libs: -L${libdir} -lfontenc
Index: oldX/oldx.pc.in
===================================================================
RCS file: /cvs/xorg/lib/oldX/oldx.pc.in,v
retrieving revision 1.2
diff -u -p -r1.2 oldx.pc.in
--- oldX/oldx.pc.in	3 Aug 2005 03:28:03 -0000	1.2
+++ oldX/oldx.pc.in	29 Sep 2005 20:32:42 -0000
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: oldX
 Description: The oldX Library
 Version: @PACKAGE_VERSION@
-Cflags: -I${includedir} @OLDX_CFLAGS@
-Libs: -L${libdir} -loldX @OLDX_LIBS@
-
+Requires: x11
+Cflags: -I${includedir}
+Libs: -L${libdir} -loldX
Index: xkbfile/xkbfile.pc.in
===================================================================
RCS file: /cvs/xorg/lib/xkbfile/xkbfile.pc.in,v
retrieving revision 1.2
diff -u -p -r1.2 xkbfile.pc.in
--- xkbfile/xkbfile.pc.in	3 Aug 2005 03:28:04 -0000	1.2
+++ xkbfile/xkbfile.pc.in	29 Sep 2005 20:32:42 -0000
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: xkbfile
 Description: The xkbfile Library
 Version: @PACKAGE_VERSION@
-Cflags: -I${includedir} @XKBFILE_CFLAGS@
-Libs: -L${libdir} -lxkbfile @XKBFILE_LIBS@
-
+Requires: x11 kbproto
+Cflags: -I${includedir}
+Libs: -L${libdir} -lxkbfile
Index: xkbui/xkbui.pc.in
===================================================================
RCS file: /cvs/xorg/lib/xkbui/xkbui.pc.in,v
retrieving revision 1.2
diff -u -p -r1.2 xkbui.pc.in
--- xkbui/xkbui.pc.in	3 Aug 2005 03:28:04 -0000	1.2
+++ xkbui/xkbui.pc.in	29 Sep 2005 20:32:42 -0000
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: xkbui
 Description: The xkbui Library
 Version: @PACKAGE_VERSION@
-Cflags: -I${includedir} @XKBUI_CFLAGS@
-Libs: -L${libdir} -lxkbui @XKBUI_LIBS@
-
+Requires: x11 xt xkbfile
+Cflags: -I${includedir}
+Libs: -L${libdir} -lxkbui