summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2010-11-09 17:13:41 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2010-11-09 17:13:41 -0800
commit0d807d97e8387a38b6a9324912b9c65662949038 (patch)
tree6f360cf030852afb8118e61e368a44f0800cad44
parentedeb291f81424ec04798618379ad252c122377ec (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.ac9
1 files changed, 7 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 1f6f020..423782b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,8 +20,14 @@ dnl PERFORMANCE OF THIS SOFTWARE.
dnl
dnl Process this file with autoconf to create configure.
+# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT(xset,[1.2.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xset)
+AC_INIT([xset], [1.2.0],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xset])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
@@ -30,7 +36,6 @@ m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-AM_CONFIG_HEADER(config.h)
# Checks for system functions
AC_CHECK_FUNCS([usleep])