summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2014-06-02 21:16:11 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2014-06-02 21:16:11 -0700
commitbbd3f086e2a4c90d0b44c02c92cf778a36ed97ef (patch)
tree82fcd95f2574f12f496d0f967ed5b46cb649394b
parent56346c72127303a445a273217f7633c2afb29cfc (diff)
config: Add missing AC_CONFIG_SRCDIR
Regroup AC statements under the Autoconf initialization section. Regroup AM statements under the Automake initialization section. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--configure.ac8
1 files changed, 5 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 752054f..cf7224a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,11 +21,16 @@ dnl PERFORMANCE OF THIS SOFTWARE.
dnl
dnl Process this file with autoconf to create configure.
+# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([setxkbmap],
[1.3.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[setxkbmap])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
@@ -33,9 +38,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)
-
-AC_CONFIG_HEADERS([config.h])
-
XORG_DEFAULT_OPTIONS
AC_ARG_WITH(xkb-config-root,