mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-17 22:06:41 +00:00
Code Issues 1 Projects Releases Wiki Activity

Automatic update of common submodule

Browse source 
From bc76a8b to c8fb372
This commit is contained in:
Tim-Philipp Müller 2015-04-03 18:58:03 +01:00
parent f529481b3d
commit 0b935a191f
2 changed files with 4 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
autogen.sh
View file

@ -57,24 +57,13 @@ autogen_options $@
printf "+ check for build tools" printf "+ check for build tools"
if test ! -z "$NOCHECK"; then echo ": skipped version checks"; else echo; fi if test ! -z "$NOCHECK"; then echo ": skipped version checks"; else echo; fi
version_check "autoconf" "$AUTOCONF autoconf autoconf270 autoconf269 autoconf268 " \ version_check "autoreconf" "autoreconf " \
"ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 68 || DIE=1 "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 68 || DIE=1
version_check "automake" "$AUTOMAKE automake automake-1.11" \
"ftp://ftp.gnu.org/pub/gnu/automake/" 1 11 || DIE=1
version_check "autopoint" "autopoint" \
"ftp://ftp.gnu.org/pub/gnu/gettext/" 0 17 || DIE=1
version_check "libtoolize" "$LIBTOOLIZE libtoolize glibtoolize" \
"ftp://ftp.gnu.org/pub/gnu/libtool/" 2 2 6 || DIE=1
version_check "pkg-config" "" \ version_check "pkg-config" "" \
"http://www.freedesktop.org/software/pkgconfig" 0 8 0 || DIE=1 "http://www.freedesktop.org/software/pkgconfig" 0 8 0 || DIE=1
die_check $DIE die_check $DIE
aclocal_check || DIE=1
autoheader_check || DIE=1
die_check $DIE
# if no arguments specified then this will be printed # if no arguments specified then this will be printed
if test -z "$*" && test -z "$NOCONFIGURE"; then if test -z "$*" && test -z "$NOCONFIGURE"; then
echo "+ checking for autogen.sh options" echo "+ checking for autogen.sh options"
@ -88,22 +77,13 @@ toplevel_check $srcfile
# autopoint # autopoint
if test -d po ; then if test -d po ; then
tool_run "$autopoint" "--force" tool_run "autopoint" "--force"
fi fi
# aclocal # aclocal
if test -f acinclude.m4; then rm acinclude.m4; fi if test -f acinclude.m4; then rm acinclude.m4; fi
tool_run "$libtoolize" "--copy --force" autoreconf --force --install || exit 1
tool_run "$aclocal" "-I m4 -I common/m4 $ACLOCAL_FLAGS"
tool_run "$autoheader"
# touch the stamp-h.in build stamp so we don't re-run autoheader in maintainer mode
echo timestamp > stamp-h.in 2> /dev/null
tool_run "$autoconf"
debug "automake: $automake"
tool_run "$automake" "--add-missing --copy"
test -n "$NOCONFIGURE" && { test -n "$NOCONFIGURE" && {
echo "+ skipping configure stage for package $package, as requested." echo "+ skipping configure stage for package $package, as requested."

2
common

@ -1 +1 @@
Subproject commit bc76a8b6a2db1cc0605158e672b2d420b4e130d0 Subproject commit c8fb372b4c58158d6cb4e309650eb7bc369f882c