aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/configure.in
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-06-09 09:24:20 +0200
committermarha <marha@users.sourceforge.net>2011-06-09 09:24:20 +0200
commit0a9d2abef2e6fac5d52556969655a62711df6418 (patch)
tree86d46767bedf8271ec0f67442259c5b3e7a8bb87 /xorg-server/xkeyboard-config/configure.in
parentadeb8256da9b636648178f729d7b3316a0a8e990 (diff)
downloadvcxsrv-0a9d2abef2e6fac5d52556969655a62711df6418.tar.gz
vcxsrv-0a9d2abef2e6fac5d52556969655a62711df6418.tar.bz2
vcxsrv-0a9d2abef2e6fac5d52556969655a62711df6418.zip
mesa xkbcomp xkeyboard-config git update 9 Jun 2011
Diffstat (limited to 'xorg-server/xkeyboard-config/configure.in')
-rw-r--r--xorg-server/xkeyboard-config/configure.in14
1 files changed, 14 insertions, 0 deletions
diff --git a/xorg-server/xkeyboard-config/configure.in b/xorg-server/xkeyboard-config/configure.in
index 527e807bd..a037abbe4 100644
--- a/xorg-server/xkeyboard-config/configure.in
+++ b/xorg-server/xkeyboard-config/configure.in
@@ -3,6 +3,13 @@ AC_CONFIG_SRCDIR(rules/base.xml.in)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.8 or later before
+ running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
+XORG_MANPAGE_SECTIONS
+
AC_SUBST(VERSION)
AC_PATH_PROG([XKBCOMP], [xkbcomp], [not_found])
@@ -24,6 +31,13 @@ AC_ARG_ENABLE( compat_rules,
enable_compat_rules="$enableval",
enable_compat_rules="yes" )
+AC_PATH_PROG(SED, [sed])
+AC_PATH_PROG(XSLTPROC, [xsltproc])
+AM_CONDITIONAL([HAVE_XSLTPROC], [test "x$XSLTPROC" != "x"])
+if test "x$XSLTPROC" = "x"; then
+ AC_MSG_WARN([xsltproc not found, needed to generate man page.])
+fi
+
# xkeyboard-config does not have build-time dependencies. However, it does
# have run-time dependencies and keyboard layouts may not work without the
# right libX11 or xproto installed.