Backport a bunch of build system fixes

Makefile.am

@@ -44,6 +44,9 @@ BUILT_SOURCES = $(BUILT_SOURCES_distclean) $(BUILT_SOURCES_clean)
 
 SUFFIXES = 
 
+DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \
+	--disable-ffmpeg --disable-faad --disable-skins2
+
 # Tell aclocal to use -I m4. Wonder if it really works.
 ACLOCAL_AMFLAGS = -I m4
 
@@ -183,7 +186,7 @@ EXTRA_DIST += \
 	extras/MacOSX/Resources/English.lproj/Extended.nib/keyedobjects.nib \
 	extras/MacOSX/Resources/English.lproj/InfoPlist.strings \
 	extras/MacOSX/Delete_Preferences.app/Contents/Info.plist \
-	extras/MacOSX/Delete_Preferences.app/Contents/Pkginfo \
+	extras/MacOSX/Delete_Preferences.app/Contents/PkgInfo \
 	extras/MacOSX/Delete_Preferences.app/Contents/MacOS/applet \
 	extras/MacOSX/Delete_Preferences.app/Contents/Resources/description.rtfd/TXT.rtf \
 	extras/MacOSX/Delete_Preferences.app/Contents/Resources/applet.icns \
@@ -545,7 +548,7 @@ endif
 install-exec-local:
 	for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
 	  rm -f "$(DESTDIR)$(bindir)/$$i" && \
-	  ln -s vlc "$(DESTDIR)$(bindir)/$$i" ; \
+	  ln -sf vlc "$(DESTDIR)$(bindir)/$$i" ; \
 	fi ; done
 	test -z "$(DATA_noinst_libvlc)" || $(INSTALL_PROGRAM) "$(DATA_noinst_libvlc)" "$(DESTDIR)$(libdir)"
 

po/POTFILES.in

@@ -75,8 +75,6 @@ src/audio_output/mixer.c
 src/audio_output/output.c
 src/control/audio_video.c
 src/control/core.c
-src/control/init.c
-src/control/plugin.c
 src/control/util.c
 src/extras/dirent.c
 src/extras/getopt.c
@@ -214,7 +212,6 @@ modules/access/vcd/cdrom.h
 modules/access/vcd/cdrom_internals.h
 modules/access/vcd/vcd.c
 modules/access/vcdx/access.c
-modules/access/vcdx/demux.c
 modules/access/vcdx/info.c
 modules/access/vcdx/info.h
 modules/access/vcdx/intf.c
@@ -339,7 +336,6 @@ modules/codec/x264.c
 modules/control/corba/corba.c
 modules/control/corba/mediacontrol-core.c
 modules/control/corba/mediacontrol-core.h
-modules/control/corba/mediacontrol-init.c
 modules/control/corba/mediacontrol-plugin.c
 modules/control/gestures.c
 modules/control/hotkeys.c
@@ -751,7 +747,6 @@ modules/misc/qte_main.cpp
 modules/misc/rtsp.c
 modules/misc/screensaver.c
 modules/misc/svg.c
-modules/misc/testsuite/playlist.c
 modules/misc/testsuite/test1.c
 modules/misc/testsuite/test2.cpp
 modules/misc/testsuite/test3.m

toolbox

@@ -6,7 +6,7 @@
 ##  Copyright (C) 2005  the VideoLAN team
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
-##           Rmi Denis-Courmont <rem # videolan.org>
+##           Rémi Denis-Courmont <rem # videolan.org>
 
 ###
 ###  Get a sane environment, just in case
@@ -178,7 +178,7 @@ then
   do
     printf "."
     #  Top of the project file
-    perl -pe 'if(/SOURCES/){last;}' < ${target}.in > ${target}
+    perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target}
     #  The source files
     for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep -v "/.*/"`
     do
@@ -275,7 +275,7 @@ EOF
 EOF
     done
     #  The headers
-    perl -e 'while(<>){if(/SOURCES/){last;}}while(<>){if(/HEADERS/){last;}print $_}' < ${target}.in >> ${target}
+    perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){if(/§HEADERS§/){last;}print $_}' < ${target}.in >> ${target}
     for file in ${LIBVLC_HEADERS}
     do
       cat >> ${target} << EOF
@@ -298,7 +298,7 @@ EOF
     cat >> ${target} << EOF
 # End Group${M}
 EOF
-    perl -e 'while(<>){if(/HEADERS/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
+    perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
   done
 
   # plugins files
@@ -319,7 +319,7 @@ EOF
         source="${msdir}/plugins.${suf}.in"
         target="${msdir}/plugin_${mod}.${suf}"
         printf "."
-        perl -pe 'if(/SOURCES/){last;} s/PLUGIN/'${mod}'/g' < ${source} > ${target}
+        perl -pe 'if(/§SOURCES§/){last;} s/§PLUGIN§/'${mod}'/g' < ${source} > ${target}
         for cfile in ${cfiles}
         do
           cat >> ${target} << EOF
@@ -336,8 +336,8 @@ SOURCE="..\\modules\\`echo ${dir}/${cfile} | sed 's,/,\\\\,g'`"${M}
 EOF
         done
         # sed is really nicer for this... unfortunately it's broken under cygwin
-        # sed -ne '1,/SOURCES/d; /HEADERS/,$d; p' < ${source} >> ${target}
-        perl -e 'while(<>){if(/SOURCES/){last;}}while(<>){if(/HEADERS/){last;}print $_}' < ${source} >> ${target}
+        # sed -ne '1,/§SOURCES§/d; /§HEADERS§/,$d; p' < ${source} >> ${target}
+        perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){if(/§HEADERS§/){last;}print $_}' < ${source} >> ${target}
         for hfile in ${hfiles}
         do
           cat >> ${target} << EOF
@@ -346,8 +346,8 @@ SOURCE="..\\modules\\`echo ${dir}/${hfile} | sed 's,/,\\\\,g'`"${M}
 # End Source File${M}
 EOF
         done
-        # sed -ne '1,/HEADERS/d; p' < ${source} >> ${target}
-        perl -e 'while(<>){if(/HEADERS/){last;}}while(<>){print $_}' < ${source} >> ${target}
+        # sed -ne '1,/§HEADERS§/d; p' < ${source} >> ${target}
+        perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${source} >> ${target}
       done
     done
   done
@@ -357,7 +357,7 @@ EOF
   do
     printf "."
     #  Top of the project file
-    perl -pe 'if(/SOURCES/){last;}' < ${target}.in > ${target}
+    perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target}
     #  The source files
       cat >> ${target} << EOF
 # Begin Source File${M}
@@ -365,7 +365,7 @@ SOURCE="..\\src\\vlc.c"${M}
 # End Source File${M}
 EOF
     #  Bottom of the project file - handles resource files too
-    perl -e 'while(<>){if(/SOURCES/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
+    perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
   done
 
   echo " done."
@@ -415,20 +415,20 @@ then
   printf "."
   #  Top of the project file
   guid=`perl -e 'sub r {return sprintf("%X", int rand(65536))} print r.r."-".r."-".r."-".r."-".r.r.r'`
-  perl -pe 'if(/SOURCES/){last;} s/GUID/'${guid}'/g' < ${target}.in > ${target}
+  perl -pe 'if(/§SOURCES§/){last;} s/§GUID§/'${guid}'/g' < ${target}.in > ${target}
   #  The source files
   cat >> ${target} << EOF
 <File RelativePath="..\\src\\vlc.c"></File>${M}
 EOF
   #  Bottom of the project file - handles resource files too
-  perl -e 'while(<>){if(/SOURCES/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
+  perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
   
   # libvlc files
   target=msvc/libvlc.vcproj
   printf "."
   #  Top of the project file
   guid=`perl -e 'sub r {return sprintf("%X", int rand(65536))} print r.r."-".r."-".r."-".r."-".r.r.r'`
-  perl -pe 'if(/SOURCES/){last;} s/GUID/'${guid}'/g' < ${target}.in > ${target}
+  perl -pe 'if(/§SOURCES§/){last;} s/§GUID§/'${guid}'/g' < ${target}.in > ${target}
   #  The source files
   for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep -v "/.*/"`
   do
@@ -463,7 +463,7 @@ EOF
 EOF
   done
   #  The headers
-  perl -e 'while(<>){if(/SOURCES/){last;}}while(<>){if(/HEADERS/){last;}print $_}' < ${target}.in >> ${target}
+  perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){if(/§HEADERS§/){last;}print $_}' < ${target}.in >> ${target}
   for file in ${LIBVLC_HEADERS}
   do
     cat >> ${target} << EOF
@@ -482,7 +482,7 @@ EOF
   cat >> ${target} << EOF
 </Filter>${M}
 EOF
-  perl -e 'while(<>){if(/HEADERS/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
+  perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
 
   # plugins files
   for dir in `sed -ne 's,modules/\(.*\)/Makefile,\1,p' ${srcdir}/configure.ac`
@@ -502,7 +502,7 @@ EOF
         target="${msdir}/plugin_${mod}.vcproj"
         printf "."
 	guid=`perl -e 'sub r {return sprintf("%X", int rand(65536))} print r.r."-".r."-".r."-".r."-".r.r.r'`
-        perl -pe 'if(/SOURCES/){last;} s/PLUGIN/'${mod}'/g' < ${source} | sed 's,GUID,'${guid}',' > ${target}
+        perl -pe 'if(/§SOURCES§/){last;} s/§PLUGIN§/'${mod}'/g' < ${source} | sed 's,§GUID§,'${guid}',' > ${target}
         for cfile in ${cfiles}
         do
           cat >> ${target} << EOF
@@ -510,16 +510,16 @@ EOF
 EOF
         done
         # sed is really nicer for this... unfortunately it's broken under cygwin
-        # sed -ne '1,/SOURCES/d; /HEADERS/,$d; p' < ${source} >> ${target}
-        perl -e 'while(<>){if(/SOURCES/){last;}}while(<>){if(/HEADERS/){last;}print $_}' < ${source} >> ${target}
+        # sed -ne '1,/§SOURCES§/d; /§HEADERS§/,$d; p' < ${source} >> ${target}
+        perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){if(/§HEADERS§/){last;}print $_}' < ${source} >> ${target}
         for hfile in ${hfiles}
         do
           cat >> ${target} << EOF
 <File RelativePath="..\\modules\\`echo ${dir}/${hfile} | sed 's,/,\\\\,g'`"></File>${M}
 EOF
         done
-        # sed -ne '1,/HEADERS/d; p' < ${source} >> ${target}
-        perl -e 'while(<>){if(/HEADERS/){last;}}while(<>){print $_}' < ${source} >> ${target}
+        # sed -ne '1,/§HEADERS§/d; p' < ${source} >> ${target}
+        perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${source} >> ${target}
       done
     done
   done
@@ -556,33 +556,34 @@ then
 
   file="${builddir}/src/misc/modules_builtin.h"
 
-  rm -f ${file}.tmp && cp ${srcdir}/src/misc/modules_builtin.h.in ${file}.tmp
+  rm -f "${file}.tmp"
+  cat "${srcdir}/src/misc/modules_builtin.h.in" > "${file}.tmp" || exit 1
   if test -n "${BUILTINS}"
   then
     for i in `echo ${BUILTINS}`
     do
-      echo "int vlc_entry__`echo $i | sed -e 'y@/@_@' -e 's@\..*@@'`( module_t* );" >>${file}.tmp
+      echo "int vlc_entry__`echo $i | sed -e 'y@/@_@' -e 's@\..*@@'`( module_t* );" >> "${file}.tmp"
     done
-    echo "" >> ${file}.tmp
+    echo "" >> "${file}.tmp"
   fi
   echo "#define ALLOCATE_ALL_BUILTINS() \\" >> ${file}.tmp
-  echo "    do \\" >> ${file}.tmp
-  echo "    { \\" >> ${file}.tmp
+  echo "    do \\" >> "${file}.tmp"
+  echo "    { \\" >> "${file}.tmp"
   if test -n "${BUILTINS}"
   then
     for i in `echo ${BUILTINS}`
     do
-      echo "        ALLOCATE_BUILTIN(`echo $i | sed -e 'y@/@_@' -e 's@\..*@@'`); \\" >> ${file}.tmp
+      echo "        ALLOCATE_BUILTIN(`echo $i | sed -e 'y@/@_@' -e 's@\..*@@'`); \\" >> "${file}.tmp"
     done
   fi
-  echo "    } while( 0 );" >> ${file}.tmp
-  echo "" >> ${file}.tmp
-  if diff >/dev/null 2>&1 ${file} ${file}.tmp
+  echo "    } while( 0 );" >> "${file}.tmp"
+  echo "" >> "${file}.tmp" || exit 1
+  if diff >/dev/null 2>&1 "${file}" "${file}.tmp"
   then
-    rm -f ${file}.tmp
+    rm -f "${file}.tmp"
   else
     echo "creating new ${file}"
-    mv -f ${file}.tmp ${file}
+    mv -f "${file}.tmp" "${file}"
   fi
 
   exit 0