diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-11-20 18:02:46 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-11-20 18:02:46 -0800 |
| commit | e56d87af20b96113dc40510811cadff028fe911f (patch) | |
| tree | 3ccf49711e18262244d0e505524cb6abfea530d0 | |
| parent | a5d49274162fbaad7dfcf5879e4e229bc7801fe0 (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.ac | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 23d925c..5487fd1 100644 --- a/configure.ac +++ b/configure.ac @@ -20,9 +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([xkbevd], [1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xkbevd]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) + +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE @@ -30,8 +35,7 @@ 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 AC_PROG_YACC AC_PATH_PROG([YACC_INST], $YACC) @@ -41,8 +45,6 @@ if test ! -f "cfgparse.c"; then fi fi -XORG_DEFAULT_OPTIONS - # Checks for pkg-config packages PKG_CHECK_MODULES(XKBEVD, xkbfile x11) |