From 441783b93783e725a074110e2309426fc946ce60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 26 Feb 2010 15:48:43 +0100 Subject: [PATCH] configure: Use automake 1.11 silent rules instead of shave if available This makes sure that we use something that is still maintained and also brings back libtool 1.5 support. --- configure.ac | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 420f02f52c..e033ed984e 100644 --- a/configure.ac +++ b/configure.ac @@ -30,6 +30,11 @@ AM_MAINTAINER_MODE dnl sets host_* variables AC_CANONICAL_HOST +dnl use pretty build output with automake >= 1.11 +m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])], + [AM_DEFAULT_VERBOSITY=1 + AC_SUBST(AM_DEFAULT_VERBOSITY)]) + dnl our libraries and install dirs use major.minor as a version GST_MAJORMINOR=$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR dnl we override it here if we need to for the release candidate of new series @@ -395,14 +400,10 @@ if test x$HAVE_FFMPEG_UNINSTALLED = x1; then fi AM_CONDITIONAL(HAVE_FFMPEG_UNINSTALLED, test x$HAVE_FFMPEG_UNINSTALLED = x1) -SHAVE_INIT([common],[enable]) - AC_CONFIG_FILES( Makefile common/Makefile common/m4/Makefile -common/shave -common/shave-libtool gst-ffmpeg.spec ext/Makefile ext/ffmpeg/Makefile