Makefile.am: add vlc_pgpkey.h

[vlc] / bootstrap

diff --git a/bootstrap b/bootstrap
index af4224432b450d226e4a21aa320cf94059e01cc6..35147d205eea91e8dac0c7a5a6ef8997ac859920 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -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
@@ -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}