[PATCH xf86-input-synaptics] build: use dnl for configure.ac comments
Diego Elio Pettenò
flameeyes at gmail.com
Wed May 25 07:13:58 PDT 2011
dnl (discard until new line) is used in m4 files to drop the line from the
output; by discarding the comments, we reduce the size of the generated
configure file, which should make it faster to parse.
---
configure.ac | 98 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/configure.ac b/configure.ac
index dfef591..855092b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,26 +1,26 @@
-# Copyright 2005 Adam Jackson.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# on the rights to use, copy, modify, merge, publish, distribute, sub
-# license, and/or sell copies of the Software, and to permit persons to whom
-# the Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Process this file with autoconf to produce a configure script
-
-# Initialize Autoconf
+dnl Copyright 2005 Adam Jackson.
+dnl
+dnl Permission is hereby granted, free of charge, to any person obtaining a
+dnl copy of this software and associated documentation files (the "Software"),
+dnl to deal in the Software without restriction, including without limitation
+dnl on the rights to use, copy, modify, merge, publish, distribute, sub
+dnl license, and/or sell copies of the Software, and to permit persons to whom
+dnl the Software is furnished to do so, subject to the following conditions:
+dnl
+dnl The above copyright notice and this permission notice (including the next
+dnl paragraph) shall be included in all copies or substantial portions of the
+dnl Software.
+dnl
+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+dnl FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+dnl ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+dnl IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+dnl CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+dnl
+dnl Process this file with autoconf to produce a configure script
+
+dnl Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-synaptics],
[1.4.99],
@@ -30,44 +30,44 @@ AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.)
-# Initialize Automake
+dnl Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2 subdir-objects])
AM_MAINTAINER_MODE
-# Initialize libtool
+dnl Initialize libtool
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
-# Initialize X.Org macros 1.13 or later for XORG_ENABLE_UNIT_TESTS
+dnl Initialize X.Org macros 1.13 or later for XORG_ENABLE_UNIT_TESTS
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.13 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.13)
XORG_DEFAULT_OPTIONS
XORG_ENABLE_UNIT_TESTS
-# Checks for libraries.
+dnl Checks for libraries.
AC_CHECK_LIB([m], [rint])
-# Store the list of server defined optional extensions in REQUIRED_MODULES
+dnl Store the list of server defined optional extensions in REQUIRED_MODULES
m4_ifndef([XORG_DRIVER_CHECK_EXT],
[m4_fatal([must install xorg-server development files before running autoconf/autogen])])
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
-# Obtain compiler/linker options for the Synaptics driver dependencies
+dnl Obtain compiler/linker options for the Synaptics driver dependencies
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.6] xproto inputproto $REQUIRED_MODULES)
-# X Server SDK location is required to install Synaptics header files
-# This location is also relayed in the xorg-synaptics.pc file
+dnl X Server SDK location is required to install Synaptics header files
+dnl This location is also relayed in the xorg-synaptics.pc file
sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
AC_SUBST([sdkdir])
DRIVER_NAME=synaptics
AC_SUBST([DRIVER_NAME])
-# -----------------------------------------------------------------------------
-# Configuration options
-# -----------------------------------------------------------------------------
-# Define a configure option for an alternate input module directory
+dnl -----------------------------------------------------------------------------
+dnl Configuration options
+dnl -----------------------------------------------------------------------------
+dnl 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]]]),
@@ -76,7 +76,7 @@ AC_ARG_WITH(xorg-module-dir,
inputdir=${moduledir}/input
AC_SUBST(inputdir)
-# Define a configure option for an alternate X Server configuration directory
+dnl 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],
@@ -86,7 +86,7 @@ AC_ARG_WITH(xorg-conf-dir,
AC_SUBST(configdir)
AM_CONDITIONAL(HAS_XORG_CONF_DIR, [test "x$sysconfigdir" != "x"])
-# Define a configure option to enable code debugging
+dnl Define a configure option to enable code debugging
AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug],
[Enable debugging (default: disabled)]),
[DEBUGGING=$enableval], [DEBUGGING=no])
@@ -95,9 +95,9 @@ if test "x$DEBUGGING" = xyes; then
fi
AM_CONDITIONAL(DEBUG, [test "x$DEBUGGING" = xyes])
-# -----------------------------------------------------------------------------
-# Determine which backend, if any, to build
-# -----------------------------------------------------------------------------
+dnl -----------------------------------------------------------------------------
+dnl Determine which backend, if any, to build
+dnl -----------------------------------------------------------------------------
AC_MSG_CHECKING([which optional backends will be build])
case "${host}" in
*linux*)
@@ -127,24 +127,24 @@ AM_CONDITIONAL([BUILD_EVENTCOMM], [test "x${BUILD_EVENTCOMM}" = "xyes"])
AM_CONDITIONAL([BUILD_PSMCOMM], [test "x${BUILD_PSMCOMM}" = "xyes"])
AM_CONDITIONAL([BUILD_PS2COMM], [test "x${BUILD_PS2COMM}" = "xyes"])
-# -----------------------------------------------------------------------------
-# Dependencies for synclient and syndaemon
-# -----------------------------------------------------------------------------
-# Obtain compiler/linker options for the Synaptics apps dependencies
+dnl -----------------------------------------------------------------------------
+dnl Dependencies for synclient and syndaemon
+dnl -----------------------------------------------------------------------------
+dnl Obtain compiler/linker options for the Synaptics apps dependencies
PKG_CHECK_MODULES(XI, x11 inputproto [xi >= 1.2])
-# The syndaemon program uses an optional XRecord extension implementation
-# If libxtst >= 1.0.99 is installed, Cflags contains the path to record.h
-# If recordproto < 1.13.99.1 is installed, Cflags contains the path to record.h
+dnl The syndaemon program uses an optional XRecord extension implementation
+dnl If libxtst >= 1.0.99 is installed, Cflags contains the path to record.h
+dnl If recordproto < 1.13.99.1 is installed, Cflags contains the path to record.h
PKG_CHECK_MODULES(XTST, xtst recordproto, have_libxtst="yes", have_libxtst="no")
if test "x$have_libxtst" = "xyes" ; then
- # Header record.h may come from the xtst or recordproto package, or may be missing
+ dnl Header record.h may come from the xtst or recordproto package, or may be missing
SAVE_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $XTST_CFLAGS"
AC_CHECK_HEADERS([X11/extensions/record.h],,,[#include <X11/Xlib.h>])
CPPFLAGS="$SAVE_CPPFLAGS"
fi
-# -----------------------------------------------------------------------------
+dnl -----------------------------------------------------------------------------
AC_CONFIG_FILES([Makefile
xorg-synaptics.pc])
--
1.7.5.rc3
More information about the xorg-devel
mailing list