diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-01-11 23:14:33 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-01-11 23:16:10 -0800 |
| commit | 5240bd2ec1bef2592de75dc6aabdfcc0d3402ec0 (patch) | |
| tree | 7cd40210027ab05a6640f98cf0e079f44e2de30d | |
| parent | 5d0f927ae0c580a6c4c3f119576753dc7b547966 (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
Replace deprecated arguments to AC_OUTPUT with AC_CONFIG_FILES
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | configure.ac | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index b0fbc83..7e4b0b3 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,13 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.60]) -AC_INIT(libXp, 1.0.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXp) +# Initialize Autoconf +AC_INIT([libXp],[1.0.0], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],[libXp]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) + +# Initialize Automake AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE @@ -33,8 +39,6 @@ m4_ifndef([XORG_MACROS_VERSION], XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS -AM_CONFIG_HEADER(config.h) - # Check for progs AC_PROG_CC AC_PROG_LIBTOOL @@ -44,8 +48,9 @@ PKG_CHECK_MODULES(XPRINT, x11 xext xextproto xau printproto) AC_SUBST(XPRINT_CFLAGS) AC_SUBST(XPRINT_LIBS) -AC_OUTPUT([Makefile - src/Makefile - man/Makefile - xp.pc]) +AC_CONFIG_FILES([Makefile + src/Makefile + man/Makefile + xp.pc]) +AC_OUTPUT |