diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-04-15 10:46:42 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-06-16 15:15:25 -0400 |
| commit | 39f1c78b01fb8f2c0450f02c8f5a6329dff6dd04 (patch) | |
| tree | 5d7e4ea7ff3be4994f6d610a2fee22b147143213 | |
| parent | 43cdbc01fb1f7197134434b7db00705e4e6c8d56 (diff) | |
config: fix warnings, m4 quoting and layout
Fix some m4 quoting
Fix some autoconf warnings
Regroup statements per section
Add comments
Upgrade X.Org macros to 1.4 for INSTALL file copying
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | configure.ac | 59 |
1 files changed, 33 insertions, 26 deletions
diff --git a/configure.ac b/configure.ac index b2ec1e9..8d37120 100644 --- a/configure.ac +++ b/configure.ac @@ -20,43 +20,31 @@ # # Process this file with autoconf to produce a configure script -AC_PREREQ(2.60) +AC_PREREQ([2.60]) AC_INIT([xf86-input-aiptek], - 1.3.0, + [1.3.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], - xf86-input-aiptek) - + [xf86-input-aiptek]) AC_CONFIG_SRCDIR([Makefile.am]) -AC_CONFIG_AUX_DIR(.) 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) -XORG_DEFAULT_OPTIONS - -# Checks for programs. +# Initialize libtool AC_DISABLE_STATIC AC_PROG_LIBTOOL -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"]) -inputdir=${moduledir}/input -AC_SUBST(inputdir) - -# Checks for extensions -XORG_DRIVER_CHECK_EXT(RANDR, randrproto) -XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) +# 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 pkg-config packages -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES) +# Checks for programs. +AC_PROG_INSTALL # Checks for libraries. AC_CHECK_LIB([m],[sqrt]) @@ -64,7 +52,26 @@ AC_CHECK_LIB([m],[sqrt]) # Checks for header files. AC_CHECK_HEADERS([linux/input.h]) +# Store the list of server defined extensions in REQUIRED_MODULES +XORG_DRIVER_CHECK_EXT(RANDR, randrproto) +XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) + +# Obtain compiler/linker options from server and required extensions +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES) + +# Define a configure option for an alternate input module directory +AC_ARG_WITH(xorg-module-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) + DRIVER_NAME=aiptek AC_SUBST([DRIVER_NAME]) -AC_OUTPUT([Makefile src/Makefile man/Makefile]) +AC_CONFIG_FILES([Makefile + man/Makefile + src/Makefile]) +AC_OUTPUT |