summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2010-11-19 22:32:12 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2010-11-19 22:32:42 -0800
commit2f6fa453f485739575296da9317243ddda25c4f6 (patch)
treead0d6e2251154ff508049eede82900de5afc92b5
parentd970d9de1c98bc828365f15fb08aaa8dda214dd6 (diff)
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 <alan.coopersmith@oracle.com>
-rw-r--r--configure.ac8
1 files changed, 5 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 7e2640f..a849599 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,11 +20,16 @@ dnl PERFORMANCE OF THIS SOFTWARE.
dnl
dnl Process this file with autoconf to create configure.
+# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([x11perf],
[1.5.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[x11perf])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
@@ -32,9 +37,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
AC_TYPE_SIGNAL