From 16656bdbb3420c73fe6ff46a31063b509ceb89f9 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Wed, 10 Nov 2010 20:55:45 -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 | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index a1c7bc6..244027c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,14 @@ +dnl Process this file with autoconf to create configure. + +# Initialize Autoconf AC_PREREQ([2.60]) +AC_INIT([libXxf86misc], [1.0.2], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], + [libXxf86misc]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([src/config.h]) -AC_INIT(libXxf86misc, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86misc) +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE @@ -8,14 +16,11 @@ 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(src/config.h) +XORG_DEFAULT_OPTIONS # Check for progs AC_PROG_LIBTOOL -XORG_DEFAULT_OPTIONS - # Checks for pkg-config packages PKG_CHECK_MODULES(XXF86MISC, xproto x11 xextproto xext xf86miscproto) -- cgit v1.2.3