configure.ac: Use Automake `silent-rules' by default.

[disorder] / configure.ac

diff --git a/configure.ac b/configure.ac
index 306b33867ec741f1569de1bf70ca092a909c0832..fcec0af4706055e8451ecd49bcecd79335ef030a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,13 +18,17 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-AC_INIT([disorder], [5.1.1], [rjk@greenend.org.uk])
+AC_INIT([disorder], [5.2], [mdw@distorted.org.uk])
 AC_CONFIG_AUX_DIR([config.aux])
 AM_INIT_AUTOMAKE([foreign])
 AC_CONFIG_SRCDIR([server/disorderd.c])
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
+m4_ifdef([AM_SILENT_RULES],
+           [AM_SILENT_RULES([yes])],
+           [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
+
 # Find host type
 AC_CANONICAL_HOST
 
@@ -196,7 +200,7 @@ AC_ARG_WITH([browser],
 
 AC_CACHE_CHECK([default HTML viewer],[rjk_cv_browser],[
   rjk_cv_browser=UNKNOWN
-  for candidate in x-www-browser sensible-browser firefox mozilla konqueror netscape; do
+  for candidate in sensible-browser x-www-browser firefox mozilla chromium google-chrome konqueror netscape; do
     if type $candidate >/dev/null 2>&1; then
       rjk_cv_browser="$candidate"
       break
@@ -455,6 +459,7 @@ AH_TEMPLATE([HAVE_GSTREAMER_0_10],
 AH_TEMPLATE([HAVE_GSTREAMER_1_0],
     [Define if building against GStreamer 1.0])
 
+mdw_gstreamer_version=nil
 for i in $want_gstreamer; do
   case $i in
     0.10) v=0.10 V=0_10 ;;
@@ -462,10 +467,11 @@ for i in $want_gstreamer; do
     *) AC_MSG_ERROR([unrecognized GStreamer version]) ;;
   esac
   PKG_CHECK_MODULES([GSTREAMER],
-      [gstreamer-$v gstreamer-app-$v gstreamer-audio-$v],
+      [gstreamer-$v gstreamer-app-$v gstreamer-audio-$v gstreamer-pbutils-$v],
       [have_gstreamer=$v], [have_gstreamer=no])
   case $have_gstreamer in no) continue ;; esac
   AC_DEFINE_UNQUOTED([HAVE_GSTREAMER_$V], [1])
+  mdw_gstreamer_version=$v
   break
 done
 
@@ -952,6 +958,16 @@ AC_CONFIG_FILES([Makefile
                 tests/Makefile])
 AC_OUTPUT
 
+# A hack: communicate our selection of GStreamer version back to the
+# Debian packaging machinery so that it can build the right dependencies.
+echo '### extra control substitutions for Debian' >debian/substvars.auto.new
+case $mdw_gstreamer_version in
+  nil) ;;
+  *) echo >>debian/substvars.auto.new \
+        "disorder:GstVersion=gstreamer$mdw_gstreamer_version" ;;
+esac
+mv debian/substvars.auto.new debian/substvars.auto
+
 if test $GCC = yes && test "$gcc_werror" = ''; then
   AC_MSG_WARN([building without -Werror])
 fi