Automake 1.10.1 compat: AM_SILENT_RULES

Part of the automated testing involves building the source on Debian Lenny
which ships an ancient version of automake (1.10.1).  Historically, this
has caused a non-fatal warning about AM_SILENT_RULES not being defined.
But when the autogen.sh script was updated to use autoreconf the warning
became fatal.

  configure.ac:31: warning: macro `AM_SILENT_RULES' not found in library
  autoreconf: running: /usr/bin/autoconf --force
  configure.ac:34: error: possibly undefined macro: AM_SILENT_RULES
        If this token and others are legitimate, please use m4_pattern_allow.

To resolve this build issue the call to AM_SILENT_RULES has been wrapped
by m4_ifdef().  This prevents the macro from being expanded on platforms
where it's undefined.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
Brian Behlendorf 2013-04-02 15:16:39 -07:00
parent 8c39262945
commit 5b5a65b022

View File

@ -37,7 +37,7 @@ AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([config]) AC_CONFIG_MACRO_DIR([config])
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
AM_SILENT_RULES m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AM_INIT_AUTOMAKE([$ZFS_META_NAME], [$ZFS_META_VERSION]) AM_INIT_AUTOMAKE([$ZFS_META_NAME], [$ZFS_META_VERSION])
AC_CONFIG_HEADERS([zfs_config.h], [ AC_CONFIG_HEADERS([zfs_config.h], [
(mv zfs_config.h zfs_config.h.tmp && (mv zfs_config.h zfs_config.h.tmp &&