summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2010-11-07 10:39:49 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2010-11-07 10:39:49 -0800
commitf78df83d15e7b159617de3850b313d3f9850f643 (patch)
tree89529ddcc0e46a8205c2df5bd393a014f7104acf
parent60c96d9b2add63684c8e28a3221fee3d807f3926 (diff)
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 <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 d35c0c8..d6da9a5 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(xwud,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xwud)
+AC_INIT([xwud], [1.0.2],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xwud])
+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