[PATCH v2 xkbcomp] Add .pc file for version export

[Peter Hutterer]

Exports xkbcomp version and the xkb base directory.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
Changes to v1:
- use libdir, not datadir
- export Requires.private as well

 Makefile.am   |    3 +++
 configure.ac  |    8 ++++++--
 xkbcomp.pc.in |    9 +++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 xkbcomp.pc.in

diff --git a/Makefile.am b/Makefile.am
index d0e991d..01632f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,6 +60,9 @@ xkbcomp_SOURCES = \
         xkbpath.h \
         xkbscan.c
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = xkbcomp.pc
+
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 
 .PHONY: ChangeLog INSTALL
diff --git a/configure.ac b/configure.ac
index 252eb1a..9c400b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,8 +45,11 @@ fi
 
 AC_CHECK_FUNCS([strdup strcasecmp])
 
+REQUIRED_MODULES="x11 xkbfile"
+
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XKBCOMP, x11 xkbfile)
+PKG_CHECK_MODULES(XKBCOMP, [$REQUIRED_MODULES])
+AC_SUBST(REQUIRED_MODULES)
 
 AC_ARG_WITH([xkb_config_root],
     [AS_HELP_STRING([--with-xkb-config-root=<paths>],
@@ -58,5 +61,6 @@ AC_SUBST([XKBCONFIGROOT])
 
 AC_CONFIG_FILES([
 	Makefile
-	man/Makefile])
+	man/Makefile
+	xkbcomp.pc])
 AC_OUTPUT
diff --git a/xkbcomp.pc.in b/xkbcomp.pc.in
new file mode 100644
index 0000000..b8d6023
--- /dev/null
+++ b/xkbcomp.pc.in
@@ -0,0 +1,9 @@
+prefix=@prefix@
+datarootdir=@datarootdir@
+datadir=@datadir@
+xkbconfigdir=@XKBCONFIGROOT@
+
+Name: xkbcomp
+Description: XKB keymap compiler
+Version: @PACKAGE_VERSION@
+Requires.private: @REQUIRED_MODULES@
-- 
1.7.5.4