mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-09 17:05:52 +00:00
Automatic update of common submodule
From aed87ae to 2736592
This commit is contained in:
parent
109be629b7
commit
ef6e3512b6
2 changed files with 23 additions and 14 deletions
35
autogen.sh
35
autogen.sh
|
@ -1,5 +1,11 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# gstreamer 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,7 +15,7 @@ cd "$srcdir"
|
||||||
|
|
||||||
DIE=0
|
DIE=0
|
||||||
package=gstreamer
|
package=gstreamer
|
||||||
srcfile=gst/gst.c
|
srcfile=gstreamer.doap
|
||||||
|
|
||||||
# Make sure we have common
|
# Make sure we have common
|
||||||
if test ! -f common/gst-autogen.sh;
|
if test ! -f common/gst-autogen.sh;
|
||||||
|
@ -37,21 +43,27 @@ 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/gstreamer-0.10.pot
|
if test -d po ; then
|
||||||
|
touch -t 200001010000 po/gstreamer-1.0.pot
|
||||||
|
fi
|
||||||
|
|
||||||
CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-failing-tests --enable-poisoning --enable-gtk-doc --enable-docbook'
|
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 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 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" \
|
||||||
"ftp://ftp.gnu.org/pub/gnu/gettext/" 0 17 || DIE=1
|
"ftp://ftp.gnu.org/pub/gnu/gettext/" 0 17 || DIE=1
|
||||||
version_check "libtoolize" "libtoolize glibtoolize" \
|
version_check "libtoolize" "$LIBTOOLIZE libtoolize glibtoolize" \
|
||||||
"ftp://ftp.gnu.org/pub/gnu/libtool/" 2 2 6 || DIE=1
|
"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
|
||||||
|
@ -75,8 +87,6 @@ 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
|
||||||
|
@ -100,16 +110,16 @@ debug "automake: $automake"
|
||||||
tool_run "$automake" "--add-missing --copy"
|
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."
|
||||||
echo "autogen.sh done."
|
echo "+ autogen.sh done."
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
|
|
||||||
cd "$olddir"
|
cd "$olddir"
|
||||||
|
|
||||||
echo "+ running configure ... "
|
echo "+ running configure ... "
|
||||||
test ! -z "$CONFIGURE_DEF_OPT" && echo " ./configure default flags: $CONFIGURE_DEF_OPT"
|
test ! -z "$CONFIGURE_DEF_OPT" && echo " default flags: $CONFIGURE_DEF_OPT"
|
||||||
test ! -z "$CONFIGURE_EXT_OPT" && echo " ./configure external flags: $CONFIGURE_EXT_OPT"
|
test ! -z "$CONFIGURE_EXT_OPT" && echo " external flags: $CONFIGURE_EXT_OPT"
|
||||||
echo
|
echo
|
||||||
|
|
||||||
echo "$srcdir/configure" $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT
|
echo "$srcdir/configure" $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT
|
||||||
|
@ -119,4 +129,3 @@ echo "$srcdir/configure" $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT
|
||||||
}
|
}
|
||||||
|
|
||||||
echo "Now type 'make' to compile $package."
|
echo "Now type 'make' to compile $package."
|
||||||
|
|
||||||
|
|
2
common
2
common
|
@ -1 +1 @@
|
||||||
Subproject commit aed87ae3f28b85b24eff734937b85473828e297d
|
Subproject commit 27365926b86b772958bedc78e446545d0ea1f2e8
|
Loading…
Reference in a new issue