diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2011-02-02 11:43:43 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2011-02-02 19:46:09 -0500 |
| commit | 9f57096dd0881651de3b710b182db59091e6f421 (patch) | |
| tree | 6d5cdf9528e93b919dcf263343c1a293292652e5 | |
| parent | 1be35fb51871f314bef673975c2be94e5e427696 (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.
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 | 42 |
1 files changed, 18 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac index 45c1688..9775463 100644 --- a/configure.ac +++ b/configure.ac @@ -1,19 +1,18 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. - +# Initialize Autoconf AC_PREREQ([2.60]) - -AC_INIT([libXmu], - [1.1.0], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], - [libXmu]) - +AC_INIT([libXmu], [1.1.0], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXmu]) AC_CONFIG_SRCDIR([Makefile.am]) -AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AC_CONFIG_HEADERS([config.h]) +# Initialize Automake +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# Initialize libtool +AC_PROG_LIBTOOL + # Require xorg-macros minimum of 1.10 for HAVE_STYLESHEETS in XORG_CHECK_SGML_DOCTOOLS m4_ifndef([XORG_MACROS_VERSION], [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])]) @@ -24,13 +23,7 @@ XORG_WITH_XMLTO(0.0.20) XORG_WITH_FOP XORG_CHECK_SGML_DOCTOOLS(1.5) -AC_CONFIG_HEADERS([config.h]) - - -# Checks for programs. -AC_PROG_LIBTOOL - -# Checks for pkg-config packages +# Obtain compiler/linker options for depedencies PKG_CHECK_MODULES(XMU, xt xext x11 xextproto) PKG_CHECK_MODULES(XMUU, x11) @@ -55,15 +48,16 @@ XTRANS_CONNECTION_FLAGS AC_DEFINE(HAS_SNPRINTF, [], [Whether we have snprintf()]) AC_SUBST(HAS_SNPRINTF) -dnl Allow checking code with lint, sparse, etc. +# Allow checking code with lint, sparse, etc. XORG_WITH_LINT XORG_LINT_LIBRARY([Xmu]) LINTLIBUU=`echo $LINTLIB | sed s/Xmu/Xmuu/` AC_SUBST(LINTLIBUU) -AC_OUTPUT([Makefile - doc/Makefile - include/Makefile - src/Makefile - xmu.pc - xmuu.pc]) +AC_CONFIG_FILES([Makefile + doc/Makefile + include/Makefile + src/Makefile + xmu.pc + xmuu.pc]) +AC_OUTPUT |