* m4/vlc.m4: output all modules to vlc-config, not just those who define

    their LDFLAGS.
  * bootstrap: use grep >/dev/null 2>&1 instead of grep -q because of retarded
    systems such as our beloved Solaris.
  * po/:
    + Regenerated vlc.pot.
    + Updated British translation.
    + Fixed fuzzy entries in the French translation.

bootstrap

 #! /bin/sh
 
 ##  bootstrap file for the VLC media player
-##  $Id: bootstrap,v 1.54 2003/07/01 12:50:56 sam Exp $
+##  $Id: bootstrap,v 1.55 2003/07/01 14:25:47 sam Exp $
 ##
 ##  Authors: Sam Hocevar <sam@zoy.org>
 
@@ -135,10 +135,10 @@ EOF
 all: all-${mod}
 
 all-${mod}:
-	if \$(VLC_CONFIG) --target plugin | grep -q "${dir}/lib${mod}_plugin"; then \$(MAKE) \$(AM_MAKEFLAGS) lib${mod}_plugin\$(LIBEXT); fi
-	if \$(VLC_CONFIG) --target builtin | grep -q "${dir}/lib${mod}\\.a"; then \$(MAKE) \$(AM_MAKEFLAGS) lib${mod}.a; fi
+	if \$(VLC_CONFIG) --target plugin | grep "${dir}/lib${mod}_plugin" >/dev/null 2>&1 ; then \$(MAKE) \$(AM_MAKEFLAGS) lib${mod}_plugin\$(LIBEXT); fi
+	if \$(VLC_CONFIG) --target builtin | grep "${dir}/lib${mod}\\.a" >/dev/null 2>&1 ; then \$(MAKE) \$(AM_MAKEFLAGS) lib${mod}.a; fi
 if BUILD_MOZILLA
-	if \$(VLC_CONFIG) --target builtin pic | grep -q "${dir}/lib${mod}_pic\\.a"; then \$(MAKE) \$(AM_MAKEFLAGS) lib${mod}_pic.a; fi
+	if \$(VLC_CONFIG) --target builtin pic | grep "${dir}/lib${mod}_pic\\.a" >/dev/null 2>&1 ; then \$(MAKE) \$(AM_MAKEFLAGS) lib${mod}_pic.a; fi
 endif
 
 if UNTRUE

m4/vlc.m4

 dnl  Macros needed for VLC
-dnl  $Id: vlc.m4,v 1.4 2003/06/29 14:57:49 sam Exp $
+dnl  $Id: vlc.m4,v 1.5 2003/07/01 14:25:47 sam Exp $
 
 dnl  Add plugins or builtins
 AC_DEFUN([AX_ADD_BUILTINS], [
@@ -31,35 +31,35 @@ dnl  Special cases: vlc, pics, plugins, save
 AC_DEFUN([AX_ADD_CPPFLAGS], [
   for element in [$1]; do
     eval "CPPFLAGS_${element}="'"$'"{CPPFLAGS_${element}} $2"'"'
-    am_plugins_with_cppflags="${am_plugins_with_cppflags} ${element}"
+    am_modules_with_cppflags="${am_modules_with_cppflags} ${element}"
   done
 ])
 
 AC_DEFUN([AX_ADD_CFLAGS], [
   for element in [$1]; do
     eval "CFLAGS_${element}="'"$'"{CFLAGS_${element}} $2"'"'
-    am_plugins_with_cflags="${am_plugins_with_cflags} ${element}"
+    am_modules_with_cflags="${am_modules_with_cflags} ${element}"
   done
 ])
 
 AC_DEFUN([AX_ADD_CXXFLAGS], [
   for element in [$1]; do
     eval "CXXFLAGS_${element}="'"$'"{CXXFLAGS_${element}} $2"'"'
-    am_plugins_with_cxxflags="${am_plugins_with_cxxflags} ${element}"
+    am_modules_with_cxxflags="${am_modules_with_cxxflags} ${element}"
   done
 ])
 
 AC_DEFUN([AX_ADD_OBJCFLAGS], [
   for element in [$1]; do
     eval "OBJCFLAGS_${element}="'"$'"{OBJCFLAGS_${element}} $2"'"'
-    am_plugins_with_objcflags="${am_plugins_with_objcflags} ${element}"
+    am_modules_with_objcflags="${am_modules_with_objcflags} ${element}"
   done
 ])
 
 AC_DEFUN([AX_ADD_LDFLAGS], [
   for element in [$1]; do
     eval "LDFLAGS_${element}="'"'"$2 "'$'"{LDFLAGS_${element}} "'"'
-    am_plugins_with_ldflags="${am_plugins_with_ldflags} ${element}"
+    am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
   done
 ])
 
@@ -67,6 +67,8 @@ AC_DEFUN([AX_OUTPUT_VLC_CONFIG_IN], [
 
   AC_MSG_RESULT(configure: creating ./vlc-config.in)
 
+  am_all_modules="`for x in ${am_modules_with_cppflags} ${am_modules_with_cflags} ${am_modules_with_cxxflags} ${am_modules_with_objcflags} ${am_modules_with_ldflags}; do echo $x; done | sort | uniq`"
+
   rm -f vlc-config.in
   sed -ne '/#@1@#/q;p' < "${srcdir}/vlc-config.in.in" \
     | sed -e "s/@gprof@/${enable_gprof}/" \
@@ -83,7 +85,7 @@ AC_DEFUN([AX_OUTPUT_VLC_CONFIG_IN], [
     > vlc-config.in
 
   dnl  Switch/case loop
-  for x in `echo ${am_plugins_with_ldflags}`
+  for x in `echo ${am_all_modules}`
   do [
     echo "    ${x})" >> vlc-config.in
     if test -n "`eval echo '$'CPPFLAGS_${x}`"; then

po/POTFILES.in

@@ -9,7 +9,6 @@ include/codecs.h
 include/configuration.h
 include/darwin_specific.h
 include/encoder.h
-include/error.h
 include/httpd.h
 include/input_ext-dec.h
 include/input_ext-intf.h
@@ -38,6 +37,7 @@ include/vlc/vout.h
 include/vlc_common.h
 include/vlc_config.h
 include/vlc_cpu.h
+include/vlc_error.h
 include/vlc_interface.h
 include/vlc_messages.h
 include/vlc_objects.h