mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 14:26:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

Automatic update of common submodule

Browse source 
From aed87ae to 3cb3d3c
This commit is contained in:
Tim-Philipp Müller 2013-04-14 17:55:02 +01:00
parent 24bc3c46f9
commit 6714d8c1ce
2 changed files with 30 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
autogen.sh
View file

@ -1,5 +1,11 @@
#!/bin/sh #!/bin/sh
#
# gst-plugins-good autogen.sh
#
# Run this to generate all the initial makefiles, etc. # Run this to generate all the initial makefiles, etc.
#
# This file has been generated from common/autogen.sh.in via common/update-autogen
test -n "$srcdir" || srcdir=`dirname "$0"` test -n "$srcdir" || srcdir=`dirname "$0"`
test -n "$srcdir" || srcdir=. test -n "$srcdir" || srcdir=.
@ -9,9 +15,8 @@ cd "$srcdir"
DIE=0 DIE=0
package=gst-plugins-good package=gst-plugins-good
srcfile=gst/law/alaw.c srcfile=gst-plugins-good.doap
echo "$(pwd)"
# Make sure we have common # Make sure we have common
if test ! -f common/gst-autogen.sh; if test ! -f common/gst-autogen.sh;
then then
@ -38,16 +43,22 @@ fi
# GNU gettext automake support doesn't get along with git. # GNU gettext automake support doesn't get along with git.
# https://bugzilla.gnome.org/show_bug.cgi?id=661128 # https://bugzilla.gnome.org/show_bug.cgi?id=661128
touch -t 200001010000 po/gst-plugins-good-0.10.pot if test -d po ; then
touch -t 200001010000 po/gst-plugins-good-1.0.pot
fi
CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-gtk-doc' CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-gtk-doc'
if test "x$package" = "xgstreamer"; then
CONFIGURE_DEF_OPT="$CONFIGURE_DEF_OPT --enable-docbook --enable-failing-tests --enable-poisoning"
fi
autogen_options $@ autogen_options $@
printf "+ check for build tools" printf "+ check for build tools"
if test ! -z "$NOCHECK"; then echo " skipped"; else echo; fi if test ! -z "$NOCHECK"; then echo ": skipped version checks"; else echo; fi
version_check "autoconf" "$AUTOCONF autoconf autoconf270 autoconf269 autoconf268 autoconf267 autoconf266 autoconf265 autoconf264 autoconf263 autoconf262" \ version_check "autoconf" "$AUTOCONF autoconf autoconf270 autoconf269 autoconf268 " \
"ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 62 || DIE=1 "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 68 || DIE=1
version_check "automake" "$AUTOMAKE automake automake-1.11" \ version_check "automake" "$AUTOMAKE automake automake-1.11" \
"ftp://ftp.gnu.org/pub/gnu/automake/" 1 11 || DIE=1 "ftp://ftp.gnu.org/pub/gnu/automake/" 1 11 || DIE=1
version_check "autopoint" "autopoint" \ version_check "autopoint" "autopoint" \
@ -65,7 +76,7 @@ autoheader_check || DIE=1
die_check $DIE die_check $DIE
# if no arguments specified then this will be printed # if no arguments specified then this will be printed
if test -z "$*"; then if test -z "$*" && test -z "$NOCONFIGURE"; then
echo "+ checking for autogen.sh options" echo "+ checking for autogen.sh options"
echo " This autogen script will automatically run ./configure as:" echo " This autogen script will automatically run ./configure as:"
echo " ./configure $CONFIGURE_DEF_OPT" echo " ./configure $CONFIGURE_DEF_OPT"
@ -76,16 +87,17 @@ fi
toplevel_check $srcfile toplevel_check $srcfile
# autopoint # autopoint
# older autopoint (< 0.12) has a tendency to complain about mkinstalldirs
if test -x mkinstalldirs; then rm mkinstalldirs; fi
# first remove patch if necessary, then run autopoint, then reapply # first remove patch if necessary, then run autopoint, then reapply
if test -f po/Makefile.in.in; if test -f po/Makefile.in.in;
then then
patch -p0 -R < common/gettext.patch patch -p0 -R --forward < common/gettext.patch
fi fi
tool_run "$autopoint --force" tool_run "$autopoint" "--force" "patch -p0 < common/gettext.patch"
patch -p0 < common/gettext.patch patch -p0 < common/gettext.patch
# aclocal
if test -f acinclude.m4; then rm acinclude.m4; fi
tool_run "$libtoolize" "--copy --force" tool_run "$libtoolize" "--copy --force"
tool_run "$aclocal" "-I m4 -I common/m4 $ACLOCAL_FLAGS" tool_run "$aclocal" "-I m4 -I common/m4 $ACLOCAL_FLAGS"
tool_run "$autoheader" tool_run "$autoheader"
@ -94,21 +106,8 @@ tool_run "$autoheader"
echo timestamp > stamp-h.in 2> /dev/null echo timestamp > stamp-h.in 2> /dev/null
tool_run "$autoconf" tool_run "$autoconf"
tool_run "$automake" "-a -c" debug "automake: $automake"
tool_run "$automake" "--add-missing --copy"
# if enable exists, add an -enable option for each of the lines in that file
if test -f enable; then
for a in `cat enable`; do
CONFIGURE_FILE_OPT="--enable-$a"
done
fi
# if disable exists, add an -disable option for each of the lines in that file
if test -f disable; then
for a in `cat disable`; do
CONFIGURE_FILE_OPT="$CONFIGURE_FILE_OPT --disable-$a"
done
fi
test -n "$NOCONFIGURE" && { test -n "$NOCONFIGURE" && {
echo "+ skipping configure stage for package $package, as requested." echo "+ skipping configure stage for package $package, as requested."
@ -119,12 +118,12 @@ test -n "$NOCONFIGURE" && {
cd "$olddir" cd "$olddir"
echo "+ running configure ... " echo "+ running configure ... "
test ! -z "$CONFIGURE_DEF_OPT" && echo " $srcdir/configure default flags: $CONFIGURE_DEF_OPT" test ! -z "$CONFIGURE_DEF_OPT" && echo " default flags: $CONFIGURE_DEF_OPT"
test ! -z "$CONFIGURE_EXT_OPT" && echo " $srcdir/configure external flags: $CONFIGURE_EXT_OPT" test ! -z "$CONFIGURE_EXT_OPT" && echo " external flags: $CONFIGURE_EXT_OPT"
test ! -z "$CONFIGURE_FILE_OPT" && echo " $srcdir/configure enable/disable flags: $CONFIGURE_FILE_OPT"
echo echo
"$srcdir/configure" $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT $CONFIGURE_FILE_OPT || { echo "$srcdir/configure" $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT
"$srcdir/configure" $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT || {
echo " configure failed" echo " configure failed"
exit 1 exit 1
} }

2
common

@ -1 +1 @@
Subproject commit aed87ae3f28b85b24eff734937b85473828e297d Subproject commit 3cb3d3cbbf794c18a6f91866c6d7fa38880c1eb8