From 3c923881f415651d75434efd209003d602253437 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Wed, 2 Feb 2011 11:43:40 -0500 Subject: 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 --- configure.ac | 17 ++++++++--------- 1 file 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 -- cgit v1.2.1