Commit 441783b9 authored by Sebastian Dröge's avatar Sebastian Dröge

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.
parent bfb25f0d
...@@ -30,6 +30,11 @@ AM_MAINTAINER_MODE ...@@ -30,6 +30,11 @@ AM_MAINTAINER_MODE
dnl sets host_* variables dnl sets host_* variables
AC_CANONICAL_HOST 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 dnl our libraries and install dirs use major.minor as a version
GST_MAJORMINOR=$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR GST_MAJORMINOR=$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR
dnl we override it here if we need to for the release candidate of new series 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 ...@@ -395,14 +400,10 @@ if test x$HAVE_FFMPEG_UNINSTALLED = x1; then
fi fi
AM_CONDITIONAL(HAVE_FFMPEG_UNINSTALLED, test x$HAVE_FFMPEG_UNINSTALLED = x1) AM_CONDITIONAL(HAVE_FFMPEG_UNINSTALLED, test x$HAVE_FFMPEG_UNINSTALLED = x1)
SHAVE_INIT([common],[enable])
AC_CONFIG_FILES( AC_CONFIG_FILES(
Makefile Makefile
common/Makefile common/Makefile
common/m4/Makefile common/m4/Makefile
common/shave
common/shave-libtool
gst-ffmpeg.spec gst-ffmpeg.spec
ext/Makefile ext/Makefile
ext/ffmpeg/Makefile ext/ffmpeg/Makefile
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment