[PATCH input-acecad 6/7] config: fix warnings and layout

[Gaetan Nadon]

Minor upgrades. Layout and comment statements.
Remove AC_PROG_CC as it overrides AC_PROG_C_C99 from
XORG_STRICT_OPTION.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 configure.ac |   49 ++++++++++++++++++++++++++++---------------------
 1 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/configure.ac b/configure.ac
index de31fef..cac381b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,39 +34,46 @@ AC_CONFIG_AUX_DIR(.)
 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
-- 
1.6.0.4