From 6dd6eed70526119003b05b9432b96dea52234d07 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sat, 20 Nov 2010 17:15:41 -0800 Subject: config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS Regroup AC statements under the Autoconf initialization section. Regroup AM statements under the Automake initialization section. Add missing AC_CONFIG_SRCDIR Signed-off-by: Alan Coopersmith --- configure.ac | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 41e6f32..4ec8c68 100644 --- a/configure.ac +++ b/configure.ac @@ -1,20 +1,21 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. +# Initialize Autoconf AC_PREREQ(2.60) -AC_INIT([xcompmgr], [1.1.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([xcompmgr], [1.1.5], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AC_CONFIG_SRCDIR([xcompmgr.c]) -AM_INIT_AUTOMAKE([dist-bzip2 foreign]) +AC_CONFIG_HEADERS([config.h]) + +# Initialize Automake +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE # Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS m4_ifndef([XORG_MACROS_VERSION], [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) XORG_MACROS_VERSION(1.3) - -AC_CONFIG_HEADER([config.h]) - -# Checks for programs. XORG_DEFAULT_OPTIONS PKG_CHECK_MODULES(XCOMPMGR, xcomposite xfixes xdamage xrender) -- cgit v1.2.3