From e4e1af2f91a591fa320551434c3efb0eaba0a5c9 Mon Sep 17 00:00:00 2001
From: Stelios Bounanos <vcs@enotty.net>
Date: Wed, 30 Sep 2009 13:25:31 +0100
Subject: [PATCH] Fix silent rules

Ensure that the SILENT_CMDS Makefile variable is always substituted.
---
 configure.ac | 2 +-
 m4/build.m4  | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index f1738dcf..8196acae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -273,7 +273,7 @@ AC_FLDIGI_DOCS
 AC_FLDIGI_BUILD_INFO
 
 ### silent build rules
-m4_ifdef([AM_SILENT_RULES], [AC_FLDIGI_BUILD_RULES])
+AC_FLDIGI_BUILD_RULES
 
 ### output
 AH_TOP([
diff --git a/m4/build.m4 b/m4/build.m4
index e2b962e8..683add01 100644
--- a/m4/build.m4
+++ b/m4/build.m4
@@ -94,7 +94,7 @@ $PULSEAUDIO_LIBS $HAMLIB_LIBS $PNG_LIBS $XMLRPC_LIBS $INTL_LIBS $PTW32_LIBS $BFD
 # command output depending on the values of the variables
 # $(AM_DEFAULT_VERBOSITY) and $(V).  These variables affect the custom
 # command output in the same way as they do for automake's build rules.
-AC_DEFUN([AC_FLDIGI_BUILD_RULES], [
+AC_DEFUN([AC_FLDIGI_BUILD_RULES_SILENT], [
   m4_ifdef([AM_SUBST_NOTMAKE], [AM_SUBST_NOTMAKE([SILENT_CMDS])])
   AC_SUBST([SILENT_CMDS],
            ['silent_cmd = @echo "  $(1)" $(2);
@@ -106,3 +106,7 @@ AC_DEFUN([AC_FLDIGI_BUILD_RULES], [
                 endif
             endif'])
 ])
+
+AC_DEFUN([AC_FLDIGI_BUILD_RULES],
+         [m4_ifdef([AM_SILENT_RULES], [AC_FLDIGI_BUILD_RULES_SILENT],
+                   [AC_SUBST([SILENT_CMDS], [])])])