diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-14 08:14:45 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-14 08:14:45 +0200 |
| commit | 6b441c10eeb02569204ff50ba8c3b739037b8141 (patch) | |
| tree | f9c0dd95a41268546aeecdd31c8588c617749cd1 /xorg-server/xkeyboard-config/configure.in | |
| parent | 0d495843cebea4ae94a3138db2bf51da80a16391 (diff) | |
| parent | 4d74e36f359d22b50302c82a922b79ac24dd3e23 (diff) | |
| download | vcxsrv-6b441c10eeb02569204ff50ba8c3b739037b8141.tar.gz vcxsrv-6b441c10eeb02569204ff50ba8c3b739037b8141.tar.bz2 vcxsrv-6b441c10eeb02569204ff50ba8c3b739037b8141.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/SConscript
mesalib/src/mesa/drivers/common/driverfuncs.c
mesalib/src/mesa/main/texgetimage.c
mesalib/src/mesa/sources.mak
mesalib/src/mesa/swrast/s_texrender.c
mesalib/src/mesa/vbo/vbo_exec_array.c
xorg-server/xkeyboard-config/configure.in
Diffstat (limited to 'xorg-server/xkeyboard-config/configure.in')
| -rw-r--r-- | xorg-server/xkeyboard-config/configure.in | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/xorg-server/xkeyboard-config/configure.in b/xorg-server/xkeyboard-config/configure.in index dab1b82d0..4604aee0e 100644 --- a/xorg-server/xkeyboard-config/configure.in +++ b/xorg-server/xkeyboard-config/configure.in @@ -3,6 +3,15 @@ AC_CONFIG_SRCDIR(rules/base.xml.in) AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
+# Require X.Org macros 1.12 or later for XORG_WITH_XSLTPROC
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.12 or later before
+ running autoconf/autogen])])
+XORG_MACROS_VERSION(1.12)
+XORG_MANPAGE_SECTIONS
+XORG_WITH_XSLTPROC
+AC_PROG_SED
+
AC_SUBST(VERSION)
AC_PATH_PROG([XKBCOMP], [xkbcomp], [not_found])
@@ -104,6 +113,7 @@ types/Makefile xkeyboard-config.pc
xkeyboard-config.spec
docs/Makefile
+man/Makefile
])
echo '***********************************************************'
|