From 5fb788d5de69239cc5306684b337b7fc0e3be821 Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <djcb@djcbsoftware.nl>
Date: Sun, 2 Jan 2011 18:46:02 +0200
Subject: [PATCH] * configure.ac: make silent-rules stuff optional

---
 configure.ac | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 74f8a93f..7e5d40bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,9 +14,6 @@
 ## along with this program; if not, write to the Free Software Foundation,
 ## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  
 
-# this is probably too strict
-# AC_PREREQ([2.6])
-
 AC_INIT([mu],[0.9.2],[http://code.google.com/p/mu0/issues/list])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/mu.cc])
@@ -26,11 +23,11 @@ AM_INIT_AUTOMAKE([dist-bzip2])
 # autotools/libtool setup. you can try to comment this out
 AC_CONFIG_MACRO_DIR([m4])
 
-# silent build; for some older autotools setups, this does not work;
-# in that case, simply comment this out
-AM_SILENT_RULES([yes])
+# silent build if we have a new enough automake
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
-LT_INIT # don't use AC_PROG_LIBTOOL anymore
+# instead of AM_PROG_LIBTOOL
+LT_INIT([disable-shared])
 
 AS_IF([test x$prefix = xNONE],[
    prefix=/usr/local])
@@ -147,6 +144,9 @@ AC_SUBST(XAPIAN_LIBS)
 AC_DEFINE(MU_XAPIAN_DB_VERSION,["9.0"], [Schema version of the database])
 
 
+
+
+
 # we test for gtk, which we need if we want to build 'mug'; for
 # experiments it can try to build with gtk3, but since that is still
 # under development, you need to explicitly enable this with '--with-gtk3'