mirrors/vlc
0
0
Fork 0
mirror of https://github.com/videolan/vlc.git synced 2024-11-30 21:33:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* ./toolbox: the MSVC project file generation no longer depends on Makefile.
This commit is contained in:
Sam Hocevar 2003-03-12 04:16:02 +00:00
parent fb9888eb89
commit 0eaf631559
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bootstrap
View File

@ -1,7 +1,7 @@
#! /bin/sh #! /bin/sh
## bootstrap file for the VLC media player ## 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> ## 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" printf "generating Modules.am and configure.ac"
rm -f Modules.am configure.ac
echo > Modules.am echo > Modules.am
echo > configure.ac echo > configure.ac
@ -171,7 +173,7 @@ echo "done."
### classic bootstrap stuff ### classic bootstrap stuff
### ###
set -x 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 rm -Rf intl
# Check for gettext # Check for gettext

11
toolbox
View File

@ -1,7 +1,7 @@
#! /bin/sh #! /bin/sh
## toolbox for the VLC media player ## 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> ## Authors: Samuel Hocevar <sam@zoy.org>
@ -81,9 +81,10 @@ fi
if test "$do_changelog" = "yes" if test "$do_changelog" = "yes"
then then
cvs2cl --help >/dev/null 2>&1 || exit 1 cvs2cl --help >/dev/null 2>&1 || exit 1
rm -f ChangeLog
cvs2cl --hide-filenames --no-wrap -w --stdout | \ cvs2cl --hide-filenames --no-wrap -w --stdout | \
sed -e 's/^[^0-9]/ /' -e 's/^ *$//' | \ sed -e 's/^[^0-9]/ /' -e 's/^ *$//' | \
uniq >| ChangeLog uniq > ChangeLog
fi fi
## ##
@ -91,12 +92,6 @@ fi
## ##
if test "$do_vc" = "yes" if test "$do_vc" = "yes"
then then
if test ! -f Makefile
then
echo "no Makefile found, did you run ./configure?"
exit 1
fi
echo "generating Visual Studio files..." echo "generating Visual Studio files..."
# The evil ^M # The evil ^M