From 35fd1d69c7377d26eae631033b93bccd1b7fd1d7 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sat, 10 Apr 2010 22:13:17 -0400 Subject: [PATCH] config: fix warnings and layout Minor upgrades. Layout and comment statements. Remove AC_PROG_CC as it overrides AC_PROG_C_C99 from XORG_STRICT_OPTION. Acked-by: Peter Hutterer Signed-off-by: Gaetan Nadon --- configure.ac | 51 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/configure.ac b/configure.ac index 15af645..949be41 100644 --- a/configure.ac +++ b/configure.ac @@ -20,6 +20,7 @@ # # Process this file with autoconf to produce a configure script +# Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-input-acecad], [1.4.0], @@ -30,42 +31,50 @@ AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR(.) +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_DEFAULT_OPTIONS -m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) +# Initialize libtool +AC_DISABLE_STATIC +AC_PROG_LIBTOOL + +# Initialize X.Org macros +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.4 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.4) XORG_DEFAULT_OPTIONS # Checks for programs. -AC_DISABLE_STATIC -AC_PROG_LIBTOOL AC_PROG_CC +AC_PROG_INSTALL + +# Checks for libraries. +AC_CHECK_LIB([sysfs], [sysfs_close_bus]) + +# Checks for header files. +AC_CHECK_HEADERS([linux/input.h sysfs/libsysfs.h]) +# Obtain compiler/linker options from dependencies +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto) + +# Checks for extensions +XORG_DRIVER_CHECK_EXT(RANDR, randrproto) +XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) + +# Define a configure option for an alternate input module directory AC_ARG_WITH(xorg-module-dir, - AC_HELP_STRING([--with-xorg-module-dir=DIR], + AS_HELP_STRING([--with-xorg-module-dir=DIR], [Default xorg module directory [[default=$libdir/xorg/modules]]]), [moduledir="$withval"], [moduledir="$libdir/xorg/modules"]) inputdir=${moduledir}/input AC_SUBST(inputdir) -# Checks for extensions -XORG_DRIVER_CHECK_EXT(RANDR, randrproto) -XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) - -# Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES) - -# Checks for libraries. -AC_CHECK_LIB([sysfs], [sysfs_close_bus]) - -# Checks for header files. -AC_CHECK_HEADERS([linux/input.h sysfs/libsysfs.h]) - DRIVER_NAME=acecad AC_SUBST([DRIVER_NAME]) -AC_OUTPUT([Makefile src/Makefile man/Makefile]) +AC_CONFIG_FILES([Makefile + man/Makefile + src/Makefile]) +AC_OUTPUT -- 2.32.0.93.g670b81a890