diff options
author | Gaetan Nadon <memsize@videotron.ca> | 2011-02-02 11:43:42 -0500 |
---|---|---|
committer | Gaetan Nadon <memsize@videotron.ca> | 2011-02-03 16:57:59 -0500 |
commit | 1e03ac60d1221d5c16b7f4797ab0c461f13b123a (patch) | |
tree | a1a7acf836707a4edc72f5a9a6fd0f8b61ff025c | |
parent | bcc24bf5bd4141cf5ca62bdd2c52d971ea88d421 (diff) | |
download | xorg-lib-libXft-1e03ac60d1221d5c16b7f4797ab0c461f13b123a.tar.gz |
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.
Add AC_CONFIG_SRCDIR([Makefile.am])
This helps automated maintenance and release activities.
Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
-rw-r--r-- | configure.ac | 74 |
1 files changed, 38 insertions, 36 deletions
diff --git a/configure.ac b/configure.ac index 0d434c3..9b9f6a7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,48 +1,49 @@ -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]) - -dnl -dnl This is the package version number, not the shared library -dnl version. This version number will be substituted into Xft.h -dnl Please bump the minor library number at each release as well. -dnl +# +# This is the package version number, not the shared library +# version. This version number will be substituted into Xft.h +# Please bump the minor library number at each release as well. +# AC_INIT([libXft], [2.2.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXft]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# Initialize libtool +AC_PROG_LIBTOOL + # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS 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 -AC_CONFIG_HEADERS(config.h) - -# checks for progs -AC_PROG_LIBTOOL # Set library version for Xft.h from package version set in AC_INIT # copied from PACKAGE_VERSION_* settings in XORG_VERSION @@ -146,7 +147,8 @@ if test "$VERSION" = "" ; then VERSION=$PACKAGE_VERSION; fi -AC_OUTPUT([Makefile - xft.pc - src/Makefile - man/Makefile]) +AC_CONFIG_FILES([Makefile + xft.pc + src/Makefile + man/Makefile]) +AC_OUTPUT |