* ./HACKING: we can now use automake-1.5 instead of automake-1.6. But now

    we _really_ depend on it.
  * ./bootstrap: we don't use touch to create a file, because it doesn't seem
    to work everywhere.

diff --git a/.cvsignore b/.cvsignore
index 8a95823e2ef676169a7986eed914235e6be3596f..c466e2242fd763d07049319a43b24c9416c60469 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,6 +1,7 @@
 .*
 m4
 intl
+ABOUT-NLS
 core
 core.*
 gmon.out
@@ -13,6 +14,7 @@ config.rpath
 config.status
 config.guess
 config.sub
+autom4te.cache
 Makefile
 Makefile.in
 Makefile.opts

diff --git a/HACKING b/HACKING
index 04db9d77a38fbbf43dbe56617a332961441c3b8b..e445b7e140cee661bdf1fdb3e40d702ab0abd703 100644 (file)
--- a/HACKING
+++ b/HACKING
@@ -1,4 +1,4 @@
-$Id: HACKING,v 1.3 2002/08/26 20:49:49 sam Exp $
+$Id: HACKING,v 1.4 2002/08/27 14:15:24 sam Exp $
 
 Hacking vlc
 ===========
@@ -6,8 +6,8 @@ Hacking vlc
 You will need the following tools if you plan to use the CVS version of vlc:
 
  - autoconf version 2.50 or later
- - automake version 1.6 or later
- - gettext version 0.10.4 or later
+ - automake version 1.5 (but 1.6 is recommended)
+ - gettext version 0.10.40 (but 0.11.3 or later is recommended)
 
 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.

diff --git a/bootstrap b/bootstrap
index 75ff4086f653e0c3794007f39411c24e7bd7e74a..70c527829010f697d5524c26b3e87f0f99f085f6 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  bootstrap.sh file for vlc, the VideoLAN Client
-##  $Id: bootstrap,v 1.6 2002/08/26 23:36:20 sam Exp $
+##  $Id: bootstrap,v 1.7 2002/08/27 14:15:24 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
@@ -50,14 +50,15 @@ else
   #  do cp ${aclocaldir}/${file} m4/
   #done
   # Yuck!
-  touch m4/Makefile.am
+  echo > m4/Makefile.am
   # Yuck!
   echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' > m4/gettext.m4
 fi
 
-aclocal -I m4
+aclocal-1.6 -I m4 || aclocal-1.5 -I m4
 autoheader
-automake --foreign --add-missing --copy
+automake-1.6 --foreign --add-missing --copy \
+  || automake-1.5 --foreign --add-missing --copy
 autoconf
 
 # nuahahahahaha !! overwriting Makefile.in with what *I* want!