* bootstrap: Fixed an automake breakage when gettext is not present.

diff --git a/bootstrap b/bootstrap
index 7e0213dd25d74956cf1a78a4eaf94de1be7699e5..3e850f337cf5ae7668d75f91ef3d85559d896410 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  bootstrap file for the VLC media player
-##  $Id: bootstrap,v 1.80 2003/10/26 14:49:26 sam Exp $
+##  $Id: bootstrap,v 1.81 2003/11/04 15:31:44 sam Exp $
 ##
 ##  Authors: Sam Hocevar <sam@zoy.org>
 
@@ -75,16 +75,10 @@ if expr `gettextize --version | sed -e '1s/[^0-9]*//' -e q` \
   GETTEXT=yes
 else
   # User's gettext is too old. try to continue anyway.
-  echo > ABOUT-NLS
-  mkdir -p intl
-  echo > intl/Makefile.am
   autopoint=:
   GETTEXT=old
 fi;else
   # we don't have gettext. grmbl. try to continue anyway.
-  echo > ABOUT-NLS
-  mkdir -p intl
-  echo > intl/Makefile.am
   autopoint=:
   GETTEXT=no
 fi
@@ -107,7 +101,7 @@ autoheader=autoheader
 ##
 
 set +x
-printf "generating modules/**/Makefile.am and m4/private.m4"
+echo "generating modules/**/Makefile.am and m4/private.m4"
 
 # Prepare m4/private.m4
 rm -f m4/private.m4 && cat > m4/private.m4 << EOF
@@ -325,7 +319,7 @@ BLAH
 EOF
 cat m4/private.m4-tmp4 >> m4/private.m4 && rm -f m4/private.m4-tmp4
 
-echo "done."
+echo " done."
 
 ###
 ###  classic bootstrap stuff
@@ -348,8 +342,13 @@ 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
 
-# Automake complains if this is not present
+# Automake complains if these are not present
 rm -f vlc-config.in && printf "" > vlc-config.in
+if [ "$GETTEXT" != "yes" ]; then
+  test -d intl || mkdir intl
+  printf "" > intl/Makefile.am
+  printf "" > ABOUT-NLS
+fi
 
 # Do the rest
 ${autopoint} -f