diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-07-05 08:23:37 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-07-07 11:03:07 +1000 |
| commit | 89c8317ad84386f69d31f38dcddbc7ff0abffb31 (patch) | |
| tree | 3c0a34ff9221ddc8d1e79cff73d0d3e5d6233f98 | |
| parent | cdb8677f370b34a3a523a32ae0023c7e8c0c965c (diff) | |
| download | xorg-app-xkbcomp-89c8317ad84386f69d31f38dcddbc7ff0abffb31.tar.gz | |
Add .pc file for version export
Exports xkbcomp version and the xkb base directory.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | xkbcomp.pc.in | 9 |
3 files changed, 18 insertions, 2 deletions
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@ |