Commit 0eaf6315 authored by Sam Hocevar's avatar Sam Hocevar
Browse files

* ./bootstrap: fixed a conflict issue with recent autopoint versions.

  * ./toolbox: the MSVC project file generation no longer depends on Makefile.
parent fb9888eb
#! /bin/sh
## bootstrap file for the VLC media player
## $Id: bootstrap,v 1.43 2003/02/03 21:47:08 sam Exp $
## $Id: bootstrap,v 1.44 2003/03/12 04:16:02 sam Exp $
##
## Authors: Samuel Hocevar <sam@zoy.org>
......@@ -45,6 +45,8 @@ if test x`uname -s` = xDarwin; then ulimit -s 20000; fi
printf "generating Modules.am and configure.ac"
rm -f Modules.am configure.ac
echo > Modules.am
echo > configure.ac
......@@ -171,7 +173,7 @@ echo "done."
### classic bootstrap stuff
###
set -x
rm -f aclocal.m4 m4/oldgettext.m4 configure config.guess config.log config.sub ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh
rm -f aclocal.m4 m4/oldgettext.m4 configure config.guess config.log config.sub ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh ABOUT-NLS
rm -Rf intl
# Check for gettext
......
#! /bin/sh
## toolbox for the VLC media player
## $Id: toolbox,v 1.12 2003/03/10 19:30:35 sam Exp $
## $Id: toolbox,v 1.13 2003/03/12 04:16:02 sam Exp $
##
## Authors: Samuel Hocevar <sam@zoy.org>
......@@ -81,9 +81,10 @@ fi
if test "$do_changelog" = "yes"
then
cvs2cl --help >/dev/null 2>&1 || exit 1
rm -f ChangeLog
cvs2cl --hide-filenames --no-wrap -w --stdout | \
sed -e 's/^[^0-9]/ /' -e 's/^ *$//' | \
uniq >| ChangeLog
uniq > ChangeLog
fi
##
......@@ -91,12 +92,6 @@ fi
##
if test "$do_vc" = "yes"
then
if test ! -f Makefile
then
echo "no Makefile found, did you run ./configure?"
exit 1
fi
echo "generating Visual Studio files..."
# The evil ^M
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment