diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-05-12 10:59:49 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-05-14 14:37:54 -0400 |
| commit | 652bf3657b116af2d012116b15d01a8bb23e7850 (patch) | |
| tree | 75670f8447ce2004477616ad6031802cf791ba7e | |
| parent | 613b44eb0878adf05a9bb4af01c84766ab5828d2 (diff) | |
| download | xorg-driver-xf86-input-keyboard-652bf3657b116af2d012116b15d01a8bb23e7850.tar.gz | |
config: fix warnings, m4 quoting and layout
Fix some m4 quoting
Fix some autoconf warnings
remove AC_PROG_CC as it overrides AC_PROG_C_C99 from XORG_DEFAULT_OPTIONS
Regroup statements per section
Add comments
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | configure.ac | 54 |
1 files changed, 31 insertions, 23 deletions
diff --git a/configure.ac b/configure.ac index bd4bfcf..5fd0aa9 100644 --- a/configure.ac +++ b/configure.ac @@ -20,32 +20,46 @@ # # Process this file with autoconf to produce a configure script -AC_PREREQ(2.60) +# Initialize Autoconf +AC_PREREQ([2.60]) AC_INIT([xf86-input-keyboard], - 1.4.0, + [1.4.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], - xf86-input-keyboard) + [xf86-input-keyboard]) 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 + +# 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 -AM_INIT_AUTOMAKE([foreign dist-bzip2]) - -AM_MAINTAINER_MODE +# Checks for programs. +AC_PROG_INSTALL +AC_PROG_SED -DRIVER_NAME=kbd -AC_SUBST([DRIVER_NAME]) +# Obtain compiler/linker options from server and required extensions +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2.99.0] xproto inputproto) -# Checks for programs. -AC_DISABLE_STATIC -AC_PROG_LIBTOOL +# Define a configure option for an alternate input module directory +AC_ARG_WITH(xorg-module-dir, + AC_HELP_STRING([--with-xorg-module-dir=DIR], + [Default xorg module directory [[default=$libdir/xorg/modules]]]), + [moduledir="$withval"], + [moduledir="$libdir/xorg/modules"]) +AC_SUBST(moduledir) +# The keyboard driver code is O/S specific case $host_os in linux*) IS_LINUX="yes" @@ -74,16 +88,10 @@ AM_CONDITIONAL(BSD, [test "x$IS_BSD" = xyes]) AM_CONDITIONAL(SOLARIS, [test "x$IS_SOLARIS" = xyes]) AM_CONDITIONAL(HURD, [test "x$IS_HURD" = xyes]) -AC_ARG_WITH(xorg-module-dir, - AC_HELP_STRING([--with-xorg-module-dir=DIR], - [Default xorg module directory [[default=$libdir/xorg/modules]]]), - [moduledir="$withval"], - [moduledir="$libdir/xorg/modules"]) -AC_SUBST(moduledir) - -# Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2.99.0] xproto inputproto) - -# Checks for libraries. +DRIVER_NAME=kbd +AC_SUBST([DRIVER_NAME]) -AC_OUTPUT([Makefile src/Makefile man/Makefile]) +AC_CONFIG_FILES([Makefile + src/Makefile + man/Makefile]) +AC_OUTPUT |