From b1f57dd038cad1ba904cb1e514df9d45d1e464e5 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sun, 7 Nov 2010 10:16:29 -0800 Subject: [PATCH] config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS Regroup AC statements under the Autoconf initialization section. Regroup AM sttaements under the Automake initialization section. Add missing AC_CONFIG_SRCDIR Change-Id: Ibb8b07021a8e78c322e5cb6245326fcf57596861 Signed-off-by: Alan Coopersmith --- configure.ac | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index acad320..009672e 100644 --- a/configure.ac +++ b/configure.ac @@ -21,8 +21,14 @@ dnl PERFORMANCE OF THIS SOFTWARE. dnl dnl Process this file with autoconf to create configure. +# Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT(xwd, [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xwd) +AC_INIT([xwd], [1.0.3], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xwd]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) + +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE @@ -30,9 +36,6 @@ AM_MAINTAINER_MODE m4_ifndef([XORG_MACROS_VERSION], [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) XORG_MACROS_VERSION(1.8) - -AM_CONFIG_HEADER(config.h) - XORG_DEFAULT_OPTIONS # Checks for pkg-config packages -- 2.7.4