Use the value of MAN_SUBSTS from util-macros for man pages

[xorg-xinput] / configure.ac

diff --git a/configure.ac b/configure.ac
index f38914f00fc962bb17814cb046fd1b0f20665c23..915d55f7955d063bbd7bbc3fcf07ae8359ded0b4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,25 +1,33 @@
 dnl  Copyright 2007 Peter Hutterer <peter@cs.unisa.edu.au>
 dnl Process this file with autoconf to create configure.
 
-AC_PREREQ([2.57])
-AC_INIT(xinput,[1.3.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinput)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AC_PREREQ([2.60])
+AC_INIT(xinput,[1.5.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinput)
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-AM_CONFIG_HEADER(config.h)
+# 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_DEFAULT_OPTIONS
+
+AC_CONFIG_HEADERS([config.h])
+
 
-AC_PROG_CC
-AC_PROG_INSTALL
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XINPUT, x11 xext xi [inputproto >= 1.4])
-AC_SUBST(XINPUT_CFLAGS)
-AC_SUBST(XINPUT_LIBS)
+PKG_CHECK_MODULES(XINPUT, x11 xext [xi >= 1.2] [inputproto >= 1.5])
 
-AC_SUBST(VERSION)
+# XI2 support
+PKG_CHECK_MODULES(XI2, [xi >= 1.2.99.2] [inputproto >= 1.9.99.15],
+                  HAVE_XI2="yes"; AC_DEFINE(HAVE_XI2, 1, [XI2 available]),
+                  HAVE_XI2="no");
+AM_CONDITIONAL(HAVE_XI2, [ test "$HAVE_XI2" = "yes" ])
 
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
+AC_SUBST(HAVE_XI2)
+
+AC_SUBST(VERSION)
 
 AC_OUTPUT([Makefile
            src/Makefile