summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2010-11-07 23:47:47 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2010-11-07 23:47:47 -0800
commit0272c10c35be588a76c27253ba1c94750b89cf61 (patch)
tree0ca51f4a1ebcf3c4895e858b266238d32dd28bc6
parent163f783b9bef4348d8488b6b927c67406c8a40b6 (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, 6 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 8400631..661246d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,12 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.60])
-AC_INIT(xclipboard, [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xclipboard)
+AC_INIT([xclipboard], [1.1.0],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xclipboard])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
@@ -32,8 +37,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_EXISTS([xkbfile], [XKBPKG="xkbfile"], [XKBPKG=""])
if test x$XKBPKG = xxkbfile ; then