diff options
author | Gaetan Nadon <memsize@videotron.ca> | 2011-02-02 11:43:41 -0500 |
---|---|---|
committer | Gaetan Nadon <memsize@videotron.ca> | 2011-02-02 11:52:45 -0500 |
commit | c702d3c41ae28dcc661fca7d8d8d7ca8ce34ef1f (patch) | |
tree | 2c6d086d17cd334695c78d0b91846b9369544d04 | |
parent | 1540933e6eaa78a96b035ec5936e63e3cdd335b2 (diff) |
config: comment, minor upgrade, quote and layout configure.ac
Group statements per section as per Autoconf standard layout
Quote statements where appropriate.
Autoconf recommends not using dnl instead of # for comments
Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters.
Use AC_PROG_LIBTOOL to replace the deprecated AM_PROG_LIBTOOL
Remove redundant AC_PROG_MAKE_SET included with AM_INIT_AUTOMAKE
Add AC_CONFIG_SRCDIR([Makefile.am]) where missing
No functional configuration changes
This helps automated maintenance and release activities.
Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r-- | configure.ac | 72 |
1 files changed, 40 insertions, 32 deletions
diff --git a/configure.ac b/configure.ac index 33c0189..97d31a1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,33 +1,39 @@ -dnl -dnl Copyright © 2003 Keith Packard, Noah Levitt -dnl -dnl Permission to use, copy, modify, distribute, and sell this software and its -dnl documentation for any purpose is hereby granted without fee, provided that -dnl the above copyright notice appear in all copies and that both that -dnl copyright notice and this permission notice appear in supporting -dnl documentation, and that the name of Keith Packard not be used in -dnl advertising or publicity pertaining to distribution of the software without -dnl specific, written prior permission. Keith Packard makes no -dnl representations about the suitability of this software for any purpose. It -dnl is provided "as is" without express or implied warranty. -dnl -dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -dnl PERFORMANCE OF THIS SOFTWARE. -dnl -dnl Process this file with autoconf to create configure. +# +# Copyright © 2003 Keith Packard, Noah Levitt +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of Keith Packard not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. Keith Packard makes no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([libXdmcp], [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXdmcp]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) + +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -AC_CONFIG_HEADERS(config.h) +# Initialize libtool +AC_LIBTOOL_WIN32_DLL +AC_PROG_LIBTOOL # Require xorg-macros minimum of 1.10 for HAVE_STYLESHEETS in XORG_CHECK_SGML_DOCTOOLS m4_ifndef([XORG_MACROS_VERSION], @@ -39,15 +45,16 @@ XORG_WITH_XMLTO(0.0.20) XORG_WITH_FOP XORG_CHECK_SGML_DOCTOOLS(1.5) +# Checks for programs. AC_PROG_LN_S -AC_LIBTOOL_WIN32_DLL -AM_PROG_LIBTOOL -AC_PROG_MAKE_SET - -AC_CHECK_FUNCS([srand48 lrand48]) +# Checks for libraries. AC_SEARCH_LIBS([recvfrom],[socket]) +# Checks for library functions. +AC_CHECK_FUNCS([srand48 lrand48]) + +# Obtain compiler/linker options for depedencies PKG_CHECK_MODULES(XDMCP, xproto) if test -f ${srcdir}/Wraphelp.c; then @@ -59,10 +66,11 @@ fi AM_CONDITIONAL(HASXDMAUTH,test x$HASXDMAUTH = xyes) -dnl Allow checking code with lint, sparse, etc. +# Allow checking code with lint, sparse, etc. XORG_WITH_LINT XORG_LINT_LIBRARY([Xdmcp]) -AC_OUTPUT([Makefile - doc/Makefile - xdmcp.pc]) +AC_CONFIG_FILES([Makefile + doc/Makefile + xdmcp.pc]) +AC_OUTPUT |