xspf: fix nodes encoding. big up to yoannp for fully nested xspf !

[vlc] / bootstrap

diff --git a/bootstrap b/bootstrap
index 04b7da4713bbaddeea454825d8f9546da672a3f7..35147d205eea91e8dac0c7a5a6ef8997ac859920 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -28,8 +28,6 @@ set -x
 ##
 ## Check for various tools
 ##
-AUTOMAKESUCKS=no
-INSTALLSUCKS=no
 
 ACLOCAL_ARGS="-I m4 ${ACLOCAL_ARGS}"
 
@@ -64,12 +62,14 @@ fi
 rm -f m4/autoconf260.m4
 case "$(autoconf --version|head -n 1)" in
   *2.5[012345678]*)
-    echo "Hey, your autoconf is quite old. Update it." >&2
+    echo "$0: you need autoconf version 2.59 or later (2.60 recommanded)."
     exit 1
     ;;
 
   *2.59*)
     echo "Enabling provisional autoconf 2.59 work-around. Update autoconf ASAP."
+    echo "Press Enter to continue"
+    read
     cp -f extras/m4/autoconf260.m4 m4/
     ;;
 esac
@@ -116,7 +116,7 @@ fi
 # Check for gettext
 if gettextize --version >/dev/null 2>&1; then
 # Autopoint is available from 0.11.3, but we need 0.11.5
-if expr `gettextize --version | sed -e '1s/[^0-9]*//' -e q` \
+if expr `gettextize --version |cut -d' ' -f2- | sed -e '1s/[^0-9]*//' -e q` \
         '>=' 0.11.5 >/dev/null 2>&1; then
   # We have gettext, and a recent version! Everything is cool.
   autopoint=autopoint
@@ -127,7 +127,7 @@ else
   GETTEXT=old
 fi;else
   set +x
-  echo "you need gettextize (package gettext-devel or gettext)"
+  echo "$0: you need gettextize (package gettext-devel or gettext)"
   exit 1
 fi
 
@@ -203,7 +203,7 @@ set -x
 rm -f aclocal.m4 configure config.log config.h config.h.in
 rm -Rf autom4te*.cache
 # remove old autotools extra cruft
-rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh
+rm -f config.guess config.sub missing mkinstalldirs depcomp install-sh
 # remove new autotools extra cruft
 rm -Rf autotools
 mkdir autotools
@@ -231,6 +231,10 @@ if test -f "ltmain.sh"; then
 fi
 
 # Do the rest
+echo $PATH
+which autopoint
+autopoint --version
+
 ${autopoint} -f
 rm -f po/Makevars.template
 ${aclocal} ${ACLOCAL_ARGS}
@@ -271,3 +275,4 @@ reliable.
 EOF
 fi
 
+echo "Successfully bootstrapped"