Update pkgconfig files to separate library build-time dependencies from

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

5 files changed, 25 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 19847a1..97c0b6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-11-19  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
+	* xaw6.pc.in:
+	* xaw7.pc.in:
+	* xaw8.pc.in:
+	Update pkgconfig files to separate library build-time dependencies
+	from application build-time dependencies.
+	* configure.ac:
+	Update dependencies to work with separate build roots.
+
 2005-11-09  Kevin E. Martin  <kem-at-freedesktop-dot-org>
 
 	* configure.ac:
diff --git a/configure.ac b/configure.ac
index 125de04..6ee88fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,7 @@ AC_ARG_ENABLE(xaw6, AC_HELP_STRING([--disable-xaw6],
 			[build_v6=$enableval], [build_v6=yes])
 
 if test "x$build_v6" = xyes; then
-   PKG_CHECK_MODULES(XAW6, xproto x11 xext xt xmu xpm)
+   PKG_CHECK_MODULES(XAW6, xproto x11 xext xextproto xt xmu xpm)
 
    AC_SUBST(XAW6_CFLAGS)
    AC_SUBST(XAW6_LIBS)
@@ -54,7 +54,7 @@ AC_ARG_ENABLE(xaw7, AC_HELP_STRING([--disable-xaw7],
 			[build_v7=$enableval], [build_v7=yes])
 
 if test "x$build_v7" = xyes; then
-   PKG_CHECK_MODULES(XAW7, xproto x11 xext xt xmu xpm)
+   PKG_CHECK_MODULES(XAW7, xproto x11 xext xextproto xt xmu xpm)
 
    AC_SUBST(XAW7_CFLAGS)
    AC_SUBST(XAW7_LIBS)
@@ -79,7 +79,7 @@ if test "x$build_v8" = xyes || test "x$build_v8" = xauto; then
       fi
       build_v8=no
    else
-       PKG_CHECK_MODULES(XAW8, xproto x11 xext xt xmu xpm xp)
+       PKG_CHECK_MODULES(XAW8, xproto x11 xext xextproto xt xmu xpm xp printproto xau)
        AC_SUBST(XAW8_CFLAGS)
        AC_SUBST(XAW8_LIBS)
        build_v8=yes
diff --git a/xaw6.pc.in b/xaw6.pc.in
index 0b88412..ba5a90a 100644
--- a/xaw6.pc.in
+++ b/xaw6.pc.in
@@ -6,5 +6,7 @@ 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 xt xmu
+Requires.private: x11 xext xt xmu xpm
+Cflags: -I${includedir}
+Libs: -L${libdir} -lXaw6
diff --git a/xaw7.pc.in b/xaw7.pc.in
index bfdaabd..11bfbb3 100644
--- a/xaw7.pc.in
+++ b/xaw7.pc.in
@@ -6,5 +6,7 @@ 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 xt xmu
+Requires.private: x11 xext xt xmu xpm
+Cflags: -I${includedir}
+Libs: -L${libdir} -lXaw7
diff --git a/xaw8.pc.in b/xaw8.pc.in
index cff3deb..9478070 100644
--- a/xaw8.pc.in
+++ b/xaw8.pc.in
@@ -6,5 +6,7 @@ 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 xt xmu printproto
+Requires.private: x11 xext xt xmu xpm xp
+Cflags: -I${includedir}
+Libs: -L${libdir} -lXaw8