From 6e6149a5d49f2de353f06d6533288e3821c04c2d Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sat, 27 Sep 2014 09:23:54 -0700
Subject: [PATCH] configure: Change the way we work around missing $(AM_V_P).

The existing approach didn't work because AM_V_P was introduced after
AM_SILENT_RULES.
---
 Makefile.am  | 2 ++
 configure.ac | 6 +-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index aea415d15e..3fc689fc6c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,8 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/gl \
 	-DINSTALLDIR=\"$(bindir)\"
 
+AM_V_P ?= :
+
 AM_CFLAGS=
 
 if cc_is_gcc
diff --git a/configure.ac b/configure.ac
index dcdf02b204..032b6f505c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -336,11 +336,7 @@ PSPP_CHECK_PREREQS
 AC_CONFIG_FILES(
   [Makefile gl/Makefile po/Makefile tests/atlocal perl-module/lib/PSPP.pm])
 
-m4_ifdef(
-  [AM_SILENT_RULES],
-  [AM_SILENT_RULES],
-  [AM_V_P=:
-   AC_SUBST([AM_V_P])])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 
 AC_OUTPUT
 echo "PSPP configured successfully."
-- 
2.30.2