diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-06-01 10:21:45 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-06-02 10:06:04 -0400 |
| commit | 7581a5f62697b8a49cff1d534bc2713f33612e7c (patch) | |
| tree | deace012eb115ff646b70e768d71d94f356a403f /configure.ac | |
| parent | 158edda13853dbd977acce55b173756e12ef4377 (diff) | |
| download | xf86-input-wacom-7581a5f62697b8a49cff1d534bc2713f33612e7c.tar.gz | |
config: comment and layout adjustments
Fix warning for AC_HELP_STRING
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 35f6f54..421f415 100644 --- a/configure.ac +++ b/configure.ac @@ -38,15 +38,15 @@ AM_MAINTAINER_MODE AC_DISABLE_STATIC AC_PROG_LIBTOOL -# Checks for libraries. -AC_CHECK_LIB([m], [rint]) - # Initialize X.Org macros m4_ifndef([XORG_MACROS_VERSION], [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) XORG_MACROS_VERSION([1.8]) XORG_DEFAULT_OPTIONS +# Checks for libraries. +AC_CHECK_LIB([m], [rint]) + # Store the list of server defined optional extensions in REQUIRED_MODULES XORG_DRIVER_CHECK_EXT(RANDR, randrproto) @@ -56,6 +56,21 @@ PKG_CHECK_MODULES(XORG, xorg-server xproto xext kbproto inputproto $REQUIRED_MOD # Obtain compiler/linker options for the xsetwacom tool PKG_CHECK_MODULES(X11, x11 xi) +# X Server SDK location is required to install wacom header files +# This location is also relayed in the xorg-wacom.pc file +sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` + +# Workaround overriding sdkdir to be able to create a tarball when user has no +# write permission in sdkdir. See DISTCHECK_CONFIGURE_FLAGS in Makefile.am +AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"]) +AC_SUBST([sdkdir]) + +DRIVER_NAME=wacom +AC_SUBST([DRIVER_NAME]) + +# ----------------------------------------------------------------------------- +# Configuration options +# ----------------------------------------------------------------------------- # Define a configure option for code debugging AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], @@ -76,27 +91,16 @@ AC_ARG_WITH(xorg-module-dir, inputdir=${moduledir}/input AC_SUBST(inputdir) -# X Server SDK location is required to install wacom header files -# This location is also relayed in the xorg-wacom.pc file -sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` - -# Workaround overriding sdkdir to be able to create a tarball when user has no -# write permission in sdkdir. See DISTCHECK_CONFIGURE_FLAGS in Makefile.am -AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"]) -AC_SUBST([sdkdir]) - # Define a configure option for an alternate X Server configuration directory sysconfigdir=`$PKG_CONFIG --variable=sysconfigdir xorg-server` AC_ARG_WITH([xorg-conf-dir], - AC_HELP_STRING([--with-xorg-conf-dir=DIR], + AS_HELP_STRING([--with-xorg-conf-dir=DIR], [Default xorg.conf.d directory [[default=from $PKG_CONFIG xorg-server]]]), [configdir="$withval"], [configdir="$sysconfigdir"]) AC_SUBST(configdir) AM_CONDITIONAL(HAS_XORG_CONF_DIR, [test "x$sysconfigdir" != "x"]) - -DRIVER_NAME=wacom -AC_SUBST([DRIVER_NAME]) +# ----------------------------------------------------------------------------- AC_CONFIG_FILES([Makefile conf/Makefile |