From 2448a83bdebae6f833d98ba816a62f255e8b6a06 Mon Sep 17 00:00:00 2001
From: Xake <xake@rymdraket.net>
Date: Sun, 27 Sep 2009 11:16:36 +0200
Subject: [PATCH] Make older autotools not barf with AM_SILENT_RULES

---
 configure.ac        |    1 -
 cpprules.in         |   10 +---------
 man/Makefile.am     |    2 +-
 man/xkb/Makefile.am |    2 +-
 nls/Makefile.am     |    6 +++---
 5 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/configure.ac b/configure.ac
index 02e6f62..f11d250 100644
--- a/configure.ac
+++ b/configure.ac
@@ -509,7 +509,6 @@ fi
 
 # Support AM_SILENT_RULES if automake-1.11 or later is used
 m4_ifdef([AM_SILENT_RULES],[HAVE_AM_SILENT_RULES=yes])
-AM_CONDITIONAL(HAVE_AM_SILENT_RULES, test x$HAVE_AM_SILENT_RULES != x)
 
 echo ""
 echo "X11 will be built with the following settings:"
diff --git a/cpprules.in b/cpprules.in
index e49341f..845e242 100644
--- a/cpprules.in
+++ b/cpprules.in
@@ -25,13 +25,5 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
-
-if HAVE_AM_SILENT_RULES
-# Support for automake 1.11 AM_SILENT_RULES
-cpp_verbose = $(cpp_verbose_$(V))
-cpp_verbose_ = $(cpp_verbose_$(AM_DEFAULT_VERBOSITY))
-cpp_verbose_0 = @echo "  CPP   " $@;
-endif HAVE_AM_SILENT_RULES
-
 .pre:
-	$(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
diff --git a/man/Makefile.am b/man/Makefile.am
index 328e386..2715777 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -218,7 +218,7 @@ MANDEFS = -D__libmansuffix__=$(LIB_MAN_SUFFIX) \
 CPP_MAN_FLAGS = $(MANDEFS) $(EXTRAMANDEFS)
 
 .man.$(LIB_MAN_SUFFIX):
-	$(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_MAN_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_MAN_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
 
 # Generate man page shadow files (Replaces InstallManPageAliases from Imake)
 all_shadows =                                \
diff --git a/man/xkb/Makefile.am b/man/xkb/Makefile.am
index a15932f..a4eaa6b 100644
--- a/man/xkb/Makefile.am
+++ b/man/xkb/Makefile.am
@@ -230,5 +230,5 @@ MANDEFS = -D__libmansuffix__=$(LIB_MAN_SUFFIX) \
 CPP_MAN_FLAGS = $(MANDEFS) $(EXTRAMANDEFS)
 
 .man.$(LIB_MAN_SUFFIX):
-	$(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_MAN_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_MAN_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
 
diff --git a/nls/Makefile.am b/nls/Makefile.am
index b4d57ca..9a00f94 100644
--- a/nls/Makefile.am
+++ b/nls/Makefile.am
@@ -75,19 +75,19 @@ SUBDIRS= \
 include $(top_srcdir)/cpprules.in
 
 locale.alias: locale.alias.pre
-	$(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/locale.alias.pre | $(CPP_SED_MAGIC) > locale.alias.l1
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/locale.alias.pre | $(CPP_SED_MAGIC) > locale.alias.l1
 	sed -e '/^[^#][^        ]*:/s/://' -e '/^[^#].*[        ].*:/d' \
         < locale.alias.l1 > locale.alias.l2
 	cat locale.alias.l2 locale.alias.l1 > locale.alias
 
 compose.dir: compose.dir.pre
-	$(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/compose.dir.pre | $(CPP_SED_MAGIC) > compose.dir.l1
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/compose.dir.pre | $(CPP_SED_MAGIC) > compose.dir.l1
 	sed -e '/^[^#][^        ]*:/s/://' -e '/^[^#].*[        ].*:/d' \
         < compose.dir.l1 > compose.dir.l2
 	cat compose.dir.l2 compose.dir.l1 > compose.dir
 
 locale.dir: locale.dir.pre
-	$(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/locale.dir.pre | $(CPP_SED_MAGIC) > locale.dir.l1
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/locale.dir.pre | $(CPP_SED_MAGIC) > locale.dir.l1
 	sed -e '/^[^#][^        ]*:/s/://' -e '/^[^#].*[        ].*:/d' \
         < locale.dir.l1 > locale.dir.l2
 	cat locale.dir.l2 locale.dir.l1 > locale.dir
-- 
1.6.5.rc1