diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-11-20 19:54:54 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-11-20 19:55:03 -0800 |
| commit | 41bf7992c45c6766c5982b3500b03d9c1b1fab87 (patch) | |
| tree | 607fe5faad306e4b4c48d0d2a6e1fda669b278f8 | |
| parent | f85d4342cbfbb58764e24e202f3a7c95eaba3d77 (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.
Regroup XORG statements under the Xorg macros section.
Add missing AC_CONFIG_SRCDIR
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | configure.ac | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index e9bb45b..d793ea9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,20 +1,25 @@ dnl Process this file with autoconf to create configure. +# Initialize Autoconf AC_PREREQ([2.60]) +AC_INIT([libXaw], [1.0.8], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXaw]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) -AC_INIT([libXaw], - [1.0.8], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], - libXaw) - +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -AM_CONFIG_HEADER(config.h) # Require xorg-macros minimum of 1.10 for HAVE_STYLESHEETS in XORG_CHECK_SGML_DOCTOOLS m4_ifndef([XORG_MACROS_VERSION], [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])]) XORG_MACROS_VERSION(1.10) +XORG_DEFAULT_OPTIONS +XORG_ENABLE_SPECS +XORG_WITH_XMLTO(0.0.20) +XORG_WITH_FOP +XORG_CHECK_SGML_DOCTOOLS(1.5) # Check for progs AC_PROG_LIBTOOL @@ -25,12 +30,6 @@ AM_PROG_CC_C_O # is in an if statement, and later calls would break if it's skipped. PKG_PROG_PKG_CONFIG -XORG_DEFAULT_OPTIONS -XORG_ENABLE_SPECS -XORG_WITH_XMLTO(0.0.20) -XORG_WITH_FOP -XORG_CHECK_SGML_DOCTOOLS(1.5) - # # fix libtool to set SONAME to libXaw.so.$major # |