From e3c094aa41b2ca724ded1c33fe2ecec9b4155dc7 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Tue, 9 Nov 2010 10:22:57 -0800 Subject: 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 Signed-off-by: Alan Coopersmith --- configure.ac | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 1135dff..a2e4c4f 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(xkill, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xkill) +AC_INIT([xkill], [1.0.2], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xkill]) +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 -- cgit v1.2.3