diff options
| -rwxr-xr-x | autogen.sh | 35 | ||||
| m--------- | common | 0 |
2 files changed, 22 insertions, 13 deletions
diff --git a/autogen.sh b/autogen.sh index 0a5e6d81b..a6cd8b4c2 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,5 +1,11 @@ #!/bin/sh +# +# gstreamer autogen.sh +# # 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=. @@ -9,7 +15,7 @@ cd "$srcdir" DIE=0 package=gstreamer -srcfile=gst/gst.c +srcfile=gstreamer.doap # Make sure we have common if test ! -f common/gst-autogen.sh; @@ -37,21 +43,27 @@ fi # GNU gettext automake support doesn't get along with git. # 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 $@ printf "+ check for build tools" 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" \ - "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 62 || DIE=1 +version_check "autoconf" "$AUTOCONF autoconf autoconf270 autoconf269 autoconf268 " \ + "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 glibtoolize" \ +version_check "libtoolize" "$LIBTOOLIZE libtoolize glibtoolize" \ "ftp://ftp.gnu.org/pub/gnu/libtool/" 2 2 6 || DIE=1 version_check "pkg-config" "" \ "http://www.freedesktop.org/software/pkgconfig" 0 8 0 || DIE=1 @@ -75,8 +87,6 @@ fi toplevel_check $srcfile # 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 if test -f po/Makefile.in.in; then @@ -100,16 +110,16 @@ debug "automake: $automake" tool_run "$automake" "--add-missing --copy" test -n "$NOCONFIGURE" && { - echo "skipping configure stage for package $package, as requested." - echo "autogen.sh done." + echo "+ skipping configure stage for package $package, as requested." + echo "+ autogen.sh done." exit 0 } cd "$olddir" echo "+ running configure ... " -test ! -z "$CONFIGURE_DEF_OPT" && echo " ./configure default flags: $CONFIGURE_DEF_OPT" -test ! -z "$CONFIGURE_EXT_OPT" && echo " ./configure external flags: $CONFIGURE_EXT_OPT" +test ! -z "$CONFIGURE_DEF_OPT" && echo " default flags: $CONFIGURE_DEF_OPT" +test ! -z "$CONFIGURE_EXT_OPT" && echo " external flags: $CONFIGURE_EXT_OPT" echo 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." - diff --git a/common b/common -Subproject aed87ae3f28b85b24eff734937b85473828e297 +Subproject 27365926b86b772958bedc78e446545d0ea1f2e |