* bootstrap:

    + Run autopoint with the -f flag.
    + Remove stamp files in the bootstrap process.

diff --git a/bootstrap b/bootstrap
index fc508e91be73ad143e2c7108f594ff2595b24606..a5f3dcd5896b869d1f215bd344709eee339c7618 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  bootstrap file for the VLC media player
-##  $Id: bootstrap,v 1.70 2003/07/17 13:09:46 sam Exp $
+##  $Id: bootstrap,v 1.71 2003/07/24 20:34:47 sam Exp $
 ##
 ##  Authors: Sam Hocevar <sam@zoy.org>
 
@@ -267,6 +267,8 @@ rm -f ABOUT-NLS
 rm -Rf intl
 # remove old vlc cruft
 rm -f m4/oldgettext.m4 stamp-pic configure.ac.in Modules.am
+# remove new vlc cruft
+rm -f stamp-builtin stamp-h* mozilla/stamp-pic
 
 # Check for gettext
 if gettextize --version >/dev/null 2>&1; then
@@ -274,7 +276,7 @@ if gettextize --version >/dev/null 2>&1; then
 if expr `gettextize --version | 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=autopoint
   GETTEXT=yes
 else
   # User's gettext is too old. try to continue anyway.
@@ -286,6 +288,7 @@ dnl  User's gettext is too old, so this is a no-op
 AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
 
 EOF
+  autopoint=:
   GETTEXT=old
 fi;else
   # we don't have gettext. grmbl. try to continue anyway.
@@ -297,6 +300,7 @@ dnl  User does not have gettext, so this is a no-op
 AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
 
 EOF
+  autopoint=:
   GETTEXT=no
 fi
 
@@ -350,14 +354,20 @@ if test "${amvers}" = "none"; then
   exit 1
 fi
 
+aclocal=aclocal${amvers}
+automake=automake${amvers}
+autoconf=autoconf
+autoheader=autoheader
+
 # Automake complains if this is not present
 rm -f vlc-config.in && printf "" > vlc-config.in
 
 # Do the rest
-aclocal${amvers} -I m4
-autoconf
-autoheader
-automake${amvers} --add-missing --copy
+${autopoint} -f
+${aclocal} -I m4
+${autoconf}
+${autoheader}
+${automake} --add-missing --copy
 
 ##
 ##  files which need to be regenerated