X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=autogen.sh;h=4a1a4078f491ea87f9af11aaed4330f142ae1339;hb=6ae04f0e3a26e31a1c1821bf6afe083f11964ddc;hp=18633ed35c00665cffb0fe6774976c787284ed0f;hpb=5c0dd4155864973b58baaa3b87da1607601d8478;p=platform%2Fupstream%2Fgstreamer.git

diff --git a/autogen.sh b/autogen.sh
index 18633ed..4a1a407 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,7 +7,11 @@ srcfile=gst/gst.c
 
 # a quick cvs co to ease the transition
 if test ! -d common; then
-  echo "+ getting common from cvs"; cvs co common
+  if test -f CVS/Tag; then
+    # get everything from CVS/Tag from second character on
+    TAG="-r `tail -c +2 CVS/Tag`"
+  fi
+  echo "+ getting common from cvs"; cvs co $TAG common
 fi
 
 # source helper functions
@@ -19,7 +23,7 @@ then
 fi
 . common/gst-autogen.sh
 
-CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-plugin-builddir --enable-failing-tests'
+CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-plugin-builddir --enable-failing-tests --enable-poisoning'
 
 autogen_options $@
 
@@ -27,9 +31,11 @@ echo -n "+ check for build tools"
 if test ! -z "$NOCHECK"; then echo ": skipped version checks"; else  echo; fi
 version_check "autoconf" "$AUTOCONF autoconf autoconf-2.54 autoconf-2.53 autoconf-2.52" \
               "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 52 || DIE=1
-version_check "automake" "$AUTOMAKE automake automake-1.7 automake-1.6 automake-1.5" \
-              "ftp://ftp.gnu.org/pub/gnu/automake/" 1 5 || DIE=1
-version_check "libtool" "" \
+version_check "automake" "$AUTOMAKE automake automake-1.7 automake17 automake-1.6" \
+              "ftp://ftp.gnu.org/pub/gnu/automake/" 1 6 || DIE=1
+version_check "autopoint" "autopoint" \
+              "ftp://ftp.gnu.org/pub/gnu/gettext/" 0 11 4 || DIE=1
+version_check "libtoolize" "libtoolize libtoolize14" \
               "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 4 0 || DIE=1
 version_check "pkg-config" "" \
               "http://www.freedesktop.org/software/pkgconfig" 0 8 0 || DIE=1
@@ -53,10 +59,22 @@ fi
 
 toplevel_check $srcfile
 
+# autopoint
+#    older autopoint (< 0.12) has a tendency to complain about mkinstalldirs
+if test -e mkinstalldirs; then rm mkinstalldirs; fi
+#    first remove patch if necessary, then run autopoint, then reapply
+if test -f po/Makefile.in.in;
+then
+  patch -p0 -R < common/gettext.patch
+fi
+tool_run "$autopoint --force"
+patch -p0 < common/gettext.patch
+
+# aclocal
 if test -f acinclude.m4; then rm acinclude.m4; fi
 tool_run "$aclocal" "-I common/m4 $ACLOCAL_FLAGS"
 
-tool_run "libtoolize" "--copy --force"
+tool_run "$libtoolize" "--force"
 tool_run "$autoheader"
 
 # touch the stamp-h.in build stamp so we don't re-run autoheader in maintainer mode -- wingo
@@ -66,18 +84,6 @@ tool_run "$autoconf"
 debug "automake: $automake"
 tool_run "$automake" "-a -c"
 
-echo
-echo "+ running autogen.sh --noconfigure $@ in libs/ext/cothreads..."
-OLDDIR=`pwd` 
-cd libs/ext/cothreads
-echo
-./autogen.sh --noconfigure $@ || {
-        echo "autogen in cothreads failed."
-        exit 1
-}
-cd "$OLDDIR"
-echo
-
 test -n "$NOCONFIGURE" && {
   echo "skipping configure stage for package $package, as requested."
   echo "autogen.sh done."
@@ -89,6 +95,7 @@ test ! -z "$CONFIGURE_DEF_OPT" && echo "  ./configure default flags: $CONFIGURE_
 test ! -z "$CONFIGURE_EXT_OPT" && echo "  ./configure external flags: $CONFIGURE_EXT_OPT"
 echo
 
+echo ./configure $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT
 ./configure $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT || {
         echo "  configure failed"
         exit 1