diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-06-14 09:18:53 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-06-14 09:24:22 +1000 |
| commit | 7798bbf89db0d08c79f2c79b5bf252858d20a61c (patch) | |
| tree | bf1704b64ecef7157d61e44a6d4d7078acecd54d | |
| parent | a675198fab13393987dc7383ff679c405d2a10ff (diff) | |
Reshuffle configure.ac to be more in-line with other modules
Also bump required macros to 1.12.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | configure.ac | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac index ad66332..ea274fc 100644 --- a/configure.ac +++ b/configure.ac @@ -27,23 +27,21 @@ AC_INIT([xf86-input-fpit], xf86-input-fpit) AC_CONFIG_SRCDIR([Makefile.am]) +AM_CONFIG_HEADER([config.h]) AC_CONFIG_AUX_DIR(.) -AM_INIT_AUTOMAKE([dist-bzip2]) +# Initialize Automake +AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE # Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) -AM_CONFIG_HEADER([config.h]) +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.12 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.12) +XORG_DEFAULT_OPTIONS -# Checks for programs. +# Initialize libtool AC_DISABLE_STATIC AC_PROG_LIBTOOL -AC_PROG_CC -XORG_CWARNFLAGS - -AH_TOP([#include "xorg-server.h"]) AC_ARG_WITH(xorg-module-dir, AC_HELP_STRING([--with-xorg-module-dir=DIR], @@ -60,18 +58,9 @@ XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) # Obtain compiler/linker options for the fpit driver dependencies PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10.0] xproto $REQUIRED_MODULES) sdkdir=$(pkg-config --variable=sdkdir xorg-server) -XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS" - -# Checks for libraries. - -# Checks for header files. -AC_HEADER_STDC +AC_SUBST([sdkdir]) DRIVER_NAME=fpit AC_SUBST([DRIVER_NAME]) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile src/Makefile man/Makefile]) |