summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2010-11-20 10:37:40 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2010-11-20 10:37:40 -0800
commit4be6d1bd7b6293ff4af1042098a6164aa9639595 (patch)
tree9778addcf0b96ed42b35ae1007f8935512c17782
parent30e01e9b012c7191c28946a73c2ff5b969d9eec7 (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.ac11
1 files changed, 7 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 3c65d87..ac76261 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(xcalc, [1.0.3],
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xcalc)
+AC_INIT([xcalc], [1.0.3],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xcalc])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
@@ -33,8 +38,6 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-AM_CONFIG_HEADER(config.h)
-
# Checks for pkg-config packages
PKG_CHECK_MODULES(XCALC, xaw7)