switch to jdk 1.5

[vlc] / bootstrap

diff --git a/bootstrap b/bootstrap
index 1d1572a63fd394693f7e7acc3abd5153f3c9886d..52a754ad4d4c1c1883182365aca90767e00a6f1d 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -63,7 +63,7 @@ case "$(autoreconf --version|head -n 1)" in
     echo "Enabling provisional autoconf 2.59 work-around. Update autoconf ASAP."
     echo "Press Enter to continue"
     read
-    cp -f extras/m4/autoconf260.m4 m4/
+    cp -f extras/buildsystem/autotools/m4/autoconf260.m4 m4/
     ;;
 esac
 
@@ -125,11 +125,12 @@ set -x
 
 # Automake complains if these are not present
 echo > vlc-config.in
-mkdir -p intl
+cp -f INSTALL INSTALL.svn
 
-autoreconf --install --force ${ACLOCAL_ARGS}
+autoreconf --install --force --verbose ${ACLOCAL_ARGS}
 rm -f po/Makevars.template
 echo > ABOUT-NLS
+mv -f INSTALL.svn INSTALL
 
 ##
 ##  files which need to be regenerated