summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2011-02-02 11:43:40 -0500
committerGaetan Nadon <memsize@videotron.ca>2011-02-02 19:34:42 -0500
commit3c923881f415651d75434efd209003d602253437 (patch)
treea4942068d72cbbcd5409eefffb112cd981358b2c
parentb29f5c9f3a728c5b7673cf54ad60d988b5dd93e7 (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.ac17
1 files changed, 8 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac
index c7eaf90..8bbefe7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,3 @@
-dnl -*- Autoconf -*-
-dnl Process this file with autoconf to produce a configure script.
# Initialize Autoconf
AC_PREREQ(2.60)
@@ -12,6 +10,9 @@ AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
+# Initialize libtool
+AC_PROG_LIBTOOL
+
# Require xorg-macros minimum of 1.10 for DocBook XML documentation
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])])
@@ -22,9 +23,6 @@ XORG_WITH_XMLTO(0.0.20)
XORG_WITH_FOP
XORG_CHECK_SGML_DOCTOOLS(1.5)
-# Checks for programs.
-AC_PROG_LIBTOOL
-
# Checks for pkg-config packages
PKG_CHECK_MODULES(SM, [ice >= 1.0.5] xproto)
PKG_CHECK_MODULES(XTRANS, xtrans)
@@ -45,7 +43,8 @@ AC_CHECK_FUNCS([uuid_create], [], [
AM_CONDITIONAL(WITH_LIBUUID, test x"$HAVE_LIBUUID" = xyes)
-AC_OUTPUT([Makefile
- doc/Makefile
- src/Makefile
- sm.pc])
+AC_CONFIG_FILES([Makefile
+ doc/Makefile
+ src/Makefile
+ sm.pc])
+AC_OUTPUT