* configure.ac:

    + Fixed a == test bashism.
    + Cosmetic changes.
  * toolbox, vlc-config.in.in: Cosmetic changes.
  * Makefile.am: Fixed the Mozilla plugin build (happy bootstrap).

Makefile.am

@@ -590,7 +590,7 @@ mozilla_libplugin_a_CFLAGS = `$(VLC_CONFIG) --cflags mozilla pic` \
                              $(CPPFLAGS_mozilla_EXTRA) -Imozilla
 mozilla_libplugin_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla pic` \
                                $(CPPFLAGS_mozilla_EXTRA) -Imozilla
-mozilla_libplugin_a_DEPENDENCIES = lib/libvlc_pic.a $(DATA_npvlc_rc) builtins_pic
+mozilla_libplugin_a_DEPENDENCIES = lib/libvlc_pic.a $(DATA_npvlc_rc)
 
 BUILT_SOURCES_mozilla = mozilla/vlcintf.h
 $(SOURCES_mozilla): mozilla/vlcintf.h

doc/fortunes.txt

@@ -473,15 +473,16 @@ the Boston strangler is to the woman home alone.
 <[MaDog]> :)
 <[MaDog]> xcuse me
 *** Signoff: [MaDog] (Client Quit)
+
   -- #videolan
 %
-13:53 < Xtophe> is there any centralien alive ?
-13:54 < thedj> i hope so. haven't heard a thing about a nuke explosion in Paris
+13:53 <Xtophe> is there any centralien alive ?
+13:54 <thedj> i hope so. haven't heard a thing about a nuke explosion in Paris
 
   -- #videolan
 %
-00:12 < thedj> i don't trust ffmpeg's make process ;)
-00:13 < gibalou> their make mess you mean ?
+00:12 <thedj> i don't trust ffmpeg's make process ;)
+00:13 <gibalou> their make mess you mean ?
 
   -- #videolan
 %
@@ -490,9 +491,16 @@ the Boston strangler is to the woman home alone.
 
   -- #videolan
 %
-17:07 < JediMaster> sh-2.03# reboot
-17:07 < JediMaster> Segmentation fault
-17:07 < JediMaster> that's not good
+17:07 <JediMaster> sh-2.03# reboot
+17:07 <JediMaster> Segmentation fault
+17:07 <JediMaster> that's not good
+
+  -- #videolan
+%
+<sam> pour votre punition, a sera un bootstrap chacun :P
+<titer> c'est reparti pour 20 min
+<gibalou> c'est reparti pour 3 x 20 min
+<sam> c'est reparti pour une modif de Makefile.am d'ici 20 min
 
   -- #videolan
 %

toolbox

 #! /bin/sh
 
 ##  toolbox for the VLC media player
-##  $Id: toolbox,v 1.35 2003/07/01 12:01:22 sam Exp $
+##  $Id: toolbox,v 1.36 2003/07/01 19:17:32 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
@@ -407,7 +407,7 @@ then
   file="${srcdir}/src/misc/modules_builtin.h"
 
   rm -f ${file}.tmp && cp ${file}.in ${file}.tmp
-  if test "${BUILTINS}" != ""
+  if test -n "${BUILTINS}"
   then
     for i in `echo ${BUILTINS}`
     do
@@ -418,7 +418,7 @@ then
   echo "#define ALLOCATE_ALL_BUILTINS() \\" >> ${file}.tmp
   echo "    do \\" >> ${file}.tmp
   echo "    { \\" >> ${file}.tmp
-  if test "${BUILTINS}" != ""
+  if test -n "${BUILTINS}"
   then
     for i in `echo ${BUILTINS}`
     do

vlc-config.in.in

@@ -216,7 +216,7 @@ done
 #
 #  If a module was requested, use its name
 #
-if test "${module}" != ""; then
+if test -n "${module}"; then
   cppflags="${cppflags} -DMODULE_NAME=${module} -DMODULE_NAME_IS_${module}"
 fi
 
@@ -224,12 +224,12 @@ fi
 #  Output what we were asked
 #
 if test "${echo_linkage}" = yes; then
-  if test "${echo_plugin}"; then
+  if test "${echo_plugin}" = yes; then
     for module in `echo "${plugins}"`; do
       register_flags "${module}"
     done
   fi
-  if test "${echo_builtin}"; then
+  if test "${echo_builtin}" = yes; then
     for module in `echo "${builtins}"`; do
       register_flags "${module}"
     done
@@ -239,21 +239,21 @@ if test "${echo_linkage}" = yes; then
 fi
 
 if test "${echo_target}" = yes; then
-  if test "${echo_plugin}"; then
+  if test "${echo_plugin}" = yes; then
     for module in `echo "${plugins}"`; do
       register_targets "${module}"
     done
-    for target in `echo ${list}`; do printf "modules/${target}_plugin "; done
+    for target in `echo "${list}"`; do printf "modules/${target}_plugin "; done
     printf '\n'
   fi
-  if test "${echo_builtin}"; then
+  if test "${echo_builtin}" = yes; then
     for module in `echo "${builtins}"`; do
       register_targets "${module}"
     done
-    if test "${echo_pic}"; then
-      for target in `echo ${list}`; do printf "modules/${target}_pic.a "; done
+    if test "${echo_pic}" = yes; then
+      for target in `echo "${list}"`; do printf "modules/${target}_pic.a "; done
     else
-      for target in `echo ${list}`; do printf "modules/${target}.a "; done
+      for target in `echo "${list}"`; do printf "modules/${target}.a "; done
     fi
     printf '\n'
   fi
@@ -279,17 +279,16 @@ if test "${echo_objcflags}" = yes; then
   echo "${cppflags} ${objcflags}"
 fi
 if test "${echo_libs}" = yes; then
-  if test "${echo_builtin}"; then
+  if test "${echo_builtin}" = yes; then
     for module in `echo "${builtins}"`; do
       register_targets "${module}"
       register_flags "${module}"
     done
-    if test "${echo_pic}"; then
-      for target in `echo ${list}`; do printf "modules/${target}_pic.a "; done
+    if test "${echo_pic}" = yes; then
+      for target in `echo "${list}"`; do printf "modules/${target}_pic.a "; done
     else
-      for target in `echo ${list}`; do printf "modules/${target}.a "; done
+      for target in `echo "${list}"`; do printf "modules/${target}.a "; done
     fi
-    printf '\n'
   fi
   echo "${libs} ${ldflags}"
 fi