Update pkgconfig files to separate library build-time dependencies from

    application build-time dependencies, and update package deps to work
    with separate build roots.

3 files changed, 39 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index 7cd2faa..39029a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-19  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
+	* Makefile.am:
+	* configure.ac:
+	Update dependencies to work with separate build roots.
+
 2005-10-18  Kevin E. Martin  <kem-at-freedesktop-dot-org>
 
 	* configure.ac:
diff --git a/Makefile.am b/Makefile.am
index 7d3c210..b3dd6c2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,8 @@ AM_CFLAGS = \
 	$(DPY_XRENDER_CFLAGS) \
 	$(DPY_XINERAMA_CFLAGS) \
 	$(DPY_DMX_CFLAGS) \
-	$(DPY_XPRINT_CFLAGS)
+	$(DPY_XPRINT_CFLAGS) \
+	$(DPY_XTST_CFLAGS)
 	
 xdpyinfo_LDADD = \
 	$(XDPYINFO_LIBS) \
@@ -45,7 +46,8 @@ xdpyinfo_LDADD = \
 	$(DPY_XRENDER_LIBS) \
 	$(DPY_XINERAMA_LIBS) \
 	$(DPY_DMX_LIBS) \
-	$(DPY_XPRINT_LIBS)
+	$(DPY_XPRINT_LIBS) \
+	$(DPY_XTST_LIBS)
 
 xdpyinfo_SOURCES =	\
         xdpyinfo.c
diff --git a/configure.ac b/configure.ac
index 0717ea4..7ecdd13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,70 +36,79 @@ PKG_CHECK_MODULES(XDPYINFO, xext x11 xtst)
 AC_SUBST(XDPYINFO_CFLAGS)
 AC_SUBST(XDPYINFO_LIBS)
 
-PKG_CHECK_MODULES(DPY_XEXT, xextproto xext,
+# This is used below to allow <X11/Xlib.h> to be found
+PKG_CHECK_MODULES(DPY_X11, x11)
+
+PKG_CHECK_MODULES(DPY_XEXT, xext,
 	[SAVE_CPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $DPY_XEXTPROTO_CFLAGS"
+	CPPFLAGS="$CPPFLAGS $DPY_XEXT_CFLAGS $DPY_X11_CFLAGS"
 	AC_CHECK_HEADERS([X11/extensions/multibuf.h X11/extensions/XShm.h],,,[#include <X11/Xlib.h>])
 	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
 
-PKG_CHECK_MODULES(DPY_XKB, kbproto x11, 
+PKG_CHECK_MODULES(DPY_XKB, x11, 
 	[SAVE_CPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $DPY_XKB_CFLAGS"
+	CPPFLAGS="$CPPFLAGS $DPY_XKB_CFLAGS $DPY_X11_CFLAGS"
 	AC_CHECK_HEADERS([X11/extensions/XKB.h X11/XKBlib.h],,,[#include <X11/Xlib.h>])
 	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
 
-PKG_CHECK_MODULES(DPY_XF86VIDMODE, xf86vidmodeproto xxf86vm, 
+PKG_CHECK_MODULES(DPY_XF86VIDMODE, xxf86vm, 
 	[SAVE_CPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $DPY_XF86VIDMODE_CFLAGS"
+	CPPFLAGS="$CPPFLAGS $DPY_XF86VIDMODE_CFLAGS $DPY_X11_CFLAGS"
 	AC_CHECK_HEADERS([X11/extensions/xf86vmode.h X11/extensions/xf86vmstr.h],,,[#include <X11/Xlib.h>])
 	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
 
-PKG_CHECK_MODULES(DPY_XF86DGA, xf86dgaproto xxf86dga, 
+PKG_CHECK_MODULES(DPY_XF86DGA, xxf86dga, 
 	[SAVE_CPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $DPY_XF86DGA_CFLAGS"
+	CPPFLAGS="$CPPFLAGS $DPY_XF86DGA_CFLAGS $DPY_X11_CFLAGS"
 	AC_CHECK_HEADERS([X11/extensions/xf86dga.h X11/extensions/xf86dgastr.h],,,
 			 [#include <X11/Xlib.h>
 #include <X11/Xproto.h>])
 	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
 
-PKG_CHECK_MODULES(DPY_XF86MISC, xf86miscproto xxf86misc, 
+PKG_CHECK_MODULES(DPY_XF86MISC, xxf86misc, 
 	[SAVE_CPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $DPY_XF86MISC_CFLAGS"
+	CPPFLAGS="$CPPFLAGS $DPY_XF86MISC_CFLAGS $DPY_X11_CFLAGS"
 	AC_CHECK_HEADERS([X11/extensions/xf86misc.h X11/extensions/xf86mscstr.h],,,
 			  [#include <X11/Xlib.h>
 #include <X11/Xproto.h>])
 	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
 
-PKG_CHECK_MODULES(DPY_XINPUT, inputproto xi, 
+PKG_CHECK_MODULES(DPY_XINPUT, xi, 
 	[SAVE_CPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $DPY_XINPUT_CFLAGS"
+	CPPFLAGS="$CPPFLAGS $DPY_XINPUT_CFLAGS $DPY_X11_CFLAGS"
 	AC_CHECK_HEADERS([X11/extensions/XInput.h],,,[#include <X11/Xlib.h>])
 	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
 
-PKG_CHECK_MODULES(DPY_XRENDER, renderproto xrender, 
+PKG_CHECK_MODULES(DPY_XRENDER, xrender, 
 	[SAVE_CPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $DPY_XRENDER_CFLAGS"
+	CPPFLAGS="$CPPFLAGS $DPY_XRENDER_CFLAGS $DPY_X11_CFLAGS"
 	AC_CHECK_HEADERS([X11/extensions/Xrender.h],,,[#include <X11/Xlib.h>])
 	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
 
-PKG_CHECK_MODULES(DPY_XINERAMA, xineramaproto xinerama, 
+PKG_CHECK_MODULES(DPY_XINERAMA, xinerama, 
 	[SAVE_CPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $DPY_XINERAMA_CFLAGS"
+	CPPFLAGS="$CPPFLAGS $DPY_XINERAMA_CFLAGS $DPY_X11_CFLAGS"
 	AC_CHECK_HEADERS([X11/extensions/Xinerama.h],,,[#include <X11/Xlib.h>])
 	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
 
-PKG_CHECK_MODULES(DPY_DMX, dmxproto dmx, 
+PKG_CHECK_MODULES(DPY_DMX, dmx, 
 	[SAVE_CPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $DPY_DMX_CFLAGS"
+	CPPFLAGS="$CPPFLAGS $DPY_DMX_CFLAGS $DPY_X11_CFLAGS"
 	AC_CHECK_HEADERS([X11/extensions/dmxext.h],,,[#include <X11/Xlib.h>])
 	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
 
-PKG_CHECK_MODULES(DPY_XPRINT, printproto xp, 
+PKG_CHECK_MODULES(DPY_XPRINT, xp, 
 	[SAVE_CPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $DPY_XPRINT_CFLAGS"
+	CPPFLAGS="$CPPFLAGS $DPY_XPRINT_CFLAGS $DPY_X11_CFLAGS"
 	AC_CHECK_HEADERS([X11/extensions/Print.h],,,[#include <X11/Xlib.h>])
 	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
 
+PKG_CHECK_MODULES(DPY_XTST, xtst, 
+	[SAVE_CPPFLAGS="$CPPFLAGS"
+	CPPFLAGS="$CPPFLAGS $DPY_XTST_CFLAGS $DPY_X11_CFLAGS"
+	AC_CHECK_HEADERS([X11/extensions/record.h],,,[#include <X11/Xlib.h>])
+	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
+
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION