aboutsummaryrefslogtreecommitdiff
path: root/xkbcomp/configure.ac
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-07-07 08:37:48 +0200
committermarha <marha@users.sourceforge.net>2011-07-07 08:37:48 +0200
commitdbe01a4f78f09723b327d1d8522bfa5026c4f6e0 (patch)
tree8b770c826cf9f64cb61ff3efd1c2f01aeb2dc8c9 /xkbcomp/configure.ac
parentd5eff0b8affe3bfa3d42f54f82d03ba3c0f3e826 (diff)
parent47a6ae678489d7082b5d7da35d1a92b4233fb5eb (diff)
downloadvcxsrv-dbe01a4f78f09723b327d1d8522bfa5026c4f6e0.tar.gz
vcxsrv-dbe01a4f78f09723b327d1d8522bfa5026c4f6e0.tar.bz2
vcxsrv-dbe01a4f78f09723b327d1d8522bfa5026c4f6e0.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/src/glsl/ir_print_visitor.cpp mesalib/src/glsl/linker.cpp mesalib/src/glsl/opt_constant_propagation.cpp mesalib/src/mesa/program/ir_to_mesa.cpp
Diffstat (limited to 'xkbcomp/configure.ac')
-rw-r--r--xkbcomp/configure.ac8
1 files changed, 6 insertions, 2 deletions
diff --git a/xkbcomp/configure.ac b/xkbcomp/configure.ac
index 252eb1a0b..9c400b650 100644
--- a/xkbcomp/configure.ac
+++ b/xkbcomp/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