use long options

[platform/upstream/gstreamer.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 8ff39b4..2141057 100755 (executable)
--- 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
@@ -30,7 +34,7 @@ version_check "autoconf" "$AUTOCONF autoconf autoconf-2.54 autoconf-2.53 autocon
 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 12 1 || DIE=1
+              "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" "" \
@@ -55,12 +59,15 @@ fi
 
 toplevel_check $srcfile
 
-# autopoint: first remove patch if necessary, then run autopoint, then reapply
+# 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"
+tool_run "$autopoint --force"
 patch -p0 < common/gettext.patch
 
 # aclocal
@@ -75,7 +82,7 @@ echo timestamp > stamp-h.in 2> /dev/null
 
 tool_run "$autoconf"
 debug "automake: $automake"
-tool_run "$automake" "-a -c"
+tool_run "$automake" "--add-missing --copy"
 
 test -n "$NOCONFIGURE" && {
   echo "skipping configure stage for package $package, as requested."
@@ -88,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