summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2014-06-03 19:31:09 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2014-06-03 19:33:37 -0700
commit76c6ceff580ff52b2c5ce89b419f792b936b71e9 (patch)
tree98bc162daebee7b02a06047d6c956e279317ee9c
parentd367e6fecf5f19c59a4dad0382b5bb90478b732c (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.ac7
1 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index acdba9b..f4a61cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,9 +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([xrx], [1.0.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xrx])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
@@ -37,8 +42,6 @@ XORG_WITH_XMLTO(0.0.20)
XORG_WITH_FOP
XORG_CHECK_SGML_DOCTOOLS(1.5)
-AM_CONFIG_HEADER(config.h)
-
AM_PROG_LIBTOOL
dnl Issue an error if xtrans.m4 was not found and XTRANS_CONNECTION_FLAGS macro