* ./bootstrap: dropped the dependency on gettext 0.11.5. Now 0.10.4 is OK.

HACKING

-$Id: HACKING,v 1.1 2002/08/25 23:18:04 sam Exp $
+$Id: HACKING,v 1.2 2002/08/26 09:38:19 sam Exp $
 
 Hacking vlc
 ===========
@@ -7,7 +7,7 @@ You will need the following tools if you plan to use the CVS version of vlc:
 
  - autoconf version 2.13 or later
  - automake version 1.4 or later
- - gettext version 0.11.5 or later
+ - gettext version 0.10.4 or later
 
 After retrieving the CVS tree, you need to run the bootstrap script to
 generate all the files needed to build vlc. You can then run configure.

Makefile.am

@@ -3,4 +3,4 @@ SUBDIRS = src include modules mozilla extras \
 
 ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = config.rpath mkinstalldirs  config.rpath
+EXTRA_DIST = config.rpath mkinstalldirs

bootstrap

 #! /bin/sh
 
 ##  bootstrap.sh file for vlc, the VideoLAN Client
-##  $Id: bootstrap,v 1.2 2002/08/26 01:01:13 sam Exp $
+##  $Id: bootstrap,v 1.3 2002/08/26 09:38:20 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
@@ -29,13 +29,18 @@ done
 ###
 ###  classic stuff
 ###
-rm -f aclocal.m4 configure config.guess config.log config.sub ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh configure.in~ Makefile.am~
+rm -f aclocal.m4 configure config.guess config.log config.sub ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh configure.in~ Makefile.am~ ChangeLog~ po/ChangeLog~
 
 aclocal
 autoheader
-gettextize --force --intl --copy --no-changelog
+
+# run gettextize and then fix its cruft
+gettextize --force --intl --copy --no-changelog || gettextize --force --copy
 test -f configure.in~ && mv configure.in~ configure.in
 test -f Makefile.am~ && mv Makefile.am~ Makefile.am
+test -f ChangeLog~ && mv ChangeLog~ ChangeLog
+test -f po/ChangeLog~ && mv po/ChangeLog~ po/ChangeLog
+
 automake --foreign --add-missing --copy
 autoconf
 aclocal -I m4