From 3a48930a027895133dcecdc58f341a619f0613f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 26 Feb 2010 15:32:14 +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 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 47464955ee..fff16d9dd9 100644 --- a/configure.ac +++ b/configure.ac @@ -29,6 +29,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 for release candidates for a new series @@ -662,12 +667,8 @@ dnl things for our internal libcheck (must be called even if building dnl libcheck is disabled because it defines conditionals) AG_GST_CHECK_CHECKS() -SHAVE_INIT([common],[enable]) - AC_CONFIG_FILES( Makefile -common/shave -common/shave-libtool gst/Makefile gst/gstconfig.h gst/gstversion.h @@ -790,7 +791,7 @@ Configuration Version : ${VERSION} Source code location : ${srcdir} Prefix : ${prefix} - Compiler : ${SHAVE_SAVED_CC} + Compiler : ${CC} Package name : ${GST_PACKAGE_NAME} Package origin : ${GST_PACKAGE_ORIGIN}