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

[vlc] / toolbox

diff --git a/toolbox b/toolbox
index ef377b53915499bafa1205f2b0903031610fa55a..912f188565253a32a0a2e3d12ab9f6cf0dc2a6eb 100755 (executable)
--- a/toolbox
+++ b/toolbox
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  toolbox for the VLC media player
-##  $Id: toolbox,v 1.44 2003/07/31 13:06:05 sam Exp $
+##  $Id: toolbox,v 1.48 2003/11/04 15:26:04 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
@@ -136,7 +136,7 @@ fi
 ##
 if test "${action}" = "vc"
 then
-  echo "generating Visual Studio files..."
+  echo "generating Visual Studio files"
 
   if test -z "${srcdir}"; then
     srcdir="`sed -ne 's/^srcdir *= *//p' < Makefile`"
@@ -163,7 +163,7 @@ then
   # config files
   for target in evc/config.h msvc/config.h
   do
-    echo "${target}"
+    printf "."
     rm -f ${target}
     sed -e "s/@CODENAME@/${LIBVLC_CODENAME}/" \
         -e "s/@VERSION@/${LIBVLC_VERSION}/" \
@@ -173,7 +173,7 @@ then
   # libvlc files
   for target in evc/libvlc.vcp msvc/libvlc.dsp
   do
-    echo "${target}"
+    printf "."
     #  Top of the project file
     perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target}
     #  The source files
@@ -296,7 +296,7 @@ EOF
         test "${msdir}" = "evc" && suf="vcp" || suf="dsp"
         source="${msdir}/plugins.${suf}.in"
         target="${msdir}/plugin_${mod}.${suf}"
-        echo "${target}"
+        printf "."
         perl -pe 'if(/§SOURCES§/){last;} s/§PLUGIN§/'${mod}'/g' < ${source} > ${target}
         for cfile in ${cfiles}
         do
@@ -327,7 +327,7 @@ EOF
   # vlc files
   for target in evc/vlc.vcp msvc/vlc.dsp
   do
-    echo "${target}"
+    printf "."
     #  Top of the project file
     perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target}
     #  The source files
@@ -349,7 +349,7 @@ EOF
     perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
   done
 
-  echo "done."
+  echo " done."
   exit 0
 fi
 
@@ -594,11 +594,15 @@ then
   #                  libarts1-dev with libarts-dev
   #                  libdvdread3-dev with libdvdread2-dev
   #                  libdvdplay0-dev (>=1.0.1-2) with libdvdplay0-dev
+  #                  libxosd-dev (>=2.2.4-1.3) with libxosd-dev
+  #                  ttf-freefonts with ttf-thryomanes
+  #                  dvb-dev (>= 1.0.1-6) with dvb-dev
   #          remove libwxgtk2.4-dev
   #                 libflac-dev
   #                 libidl0 (workaround for mozilla-dev's bad deps)
   #                 libglib2.0-0 (workaround for mozilla-dev's bad deps)
   #                 libmatroska-dev
+  #                 libspeex-dev
   #          change Source: vlc with Source: vlc-woody
   #                 Section: gnome with Section: graphics
   #                 Section: kde with Section: kde
@@ -611,12 +615,16 @@ then
       -e 's/libarts[0-9]*-dev/libarts-dev/' \
       -e 's/libdvdread[0-9]*-dev/libdvdread2-dev/' \
       -e 's/, libdvdplay0-dev[^,]*/, libdvdplay0-dev/' \
+      -e 's/, libxosd-dev[^,]*/, libxosd-dev/' \
+      -e 's/, ttf-freefonts[^,]*/, ttf-thryomanes/' \
+      -e 's/, dvb-dev[^,]*/, dvb-dev/' \
       -e 's/, libwx[^,]*//' \
       -e '/Package: wxvlc/,/^ *$/d' \
       -e 's/, libflac-dev[^,]*//' \
       -e 's/, libidl0[^,]*//' \
       -e 's/, libglib2.0-0[^,]*//' \
       -e 's/, libmatroska-dev[^,]*//' \
+      -e 's/, libspeex-dev[^,]*//' \
       -e 's/Source: vlc/Source: vlc-woody/' \
       -e 's/Section: gnome/Section: graphics/' \
       -e 's/Section: kde/Section: graphics/' \
@@ -632,6 +640,7 @@ then
       -e 's,--enable-skins,--disable-skins,' \
       -e 's,--enable-flac,--disable-flac,' \
       -e 's,--enable-mkv,--disable-mkv,' \
+      -e 's,--enable-speex,--disable-speex,' \
       < "$1/debian/rules" > "$1/debian/rules.woody"
   mv "$1/debian/rules.woody" "$1/debian/rules"
   chmod 0755 "$1/debian/rules"