* modules/access/dvdplay/access.c: fixed subtitles with the dvdplay plugin

[vlc] / bootstrap

diff --git a/bootstrap b/bootstrap
index a2e3e7919659a60314a4b04c6a0bc23ac7b3c31e..36c87c6bcb5be51d2aabbf83426e46a7870e2231 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,10 +1,17 @@
 #! /bin/sh
 
 ##  bootstrap file for vlc, the VideoLAN Client
-##  $Id: bootstrap,v 1.37 2002/12/25 22:36:14 sam Exp $
+##  $Id: bootstrap,v 1.40 2003/01/28 17:11:38 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
+if test x$# != x0; then
+  echo "Usage: ./bootstrap"
+  echo "  Calls automake, autoconf, autoheader, autopoint and other auto* to build"
+  echo "  Makefiles."
+  exit 1
+fi
+
 ###
 ###  Get a sane environment, just in case
 ###
@@ -148,7 +155,7 @@ lib${mod}_DATA = \$(D_${mod}_p)
 lib${mod}dir = \$(libdir)/vlc/${topdir}
 ${PRIVATE}noinst_LIBRARIES += \$(L_${mod}_p)
 ${PRIVATE}${dir}/lib${mod}_plugin\$(LIBEXT): \$(${sym}_lib${mod}_plugin_a_OBJECTS)
-${PRIVATE}     \$(${LINKER}) \$^ -shared \$(LDFLAGS_plugins) \$(LDFLAGS_${mod})
+${PRIVATE}     \$(${LINKER}) \$(${sym}_lib${mod}_plugin_a_OBJECTS) -shared \$(LDFLAGS_plugins) \$(LDFLAGS_${mod})
 
 
 EOF
@@ -276,39 +283,6 @@ rm -f mozilla/vlcintf.h
 ##
 set +x
 
-##
-##  Glade sometimes sucks
-##
-echo "workarounds for annoying glade features"
-for file in gnome_interface.c gtk_interface.c
-do
-if grep "DO NOT EDIT THIS FILE" modules/gui/gtk/$file 2>&1 > /dev/null
-then
-    rm -f /tmp/$$.$file.bak
-    cat > /tmp/$$.$file.bak << EOF
-/* This file was created automatically by glade and fixed by bootstrap */
-
-#include <vlc/vlc.h>
-EOF
-    sed -e 1,7d \
-        -e 's#_("-:--:--")#"-:--:--"#' \
-        -e 's#_("---")#"---"#' \
-        -e 's#_("--")#"--"#' \
-        -e 's#_("/dev/dvd")#"/dev/dvd"#' \
-        -e 's#_(\("./."\))#\1#' \
-        < modules/gui/gtk/$file >> /tmp/$$.$file.bak
-    mv -f /tmp/$$.$file.bak modules/gui/gtk/$file
-fi
-done
-
-file=gtk_support.h
-if grep "DO NOT EDIT THIS FILE" modules/gui/gtk/$file 2>&1 > /dev/null
-then
-    rm -f /tmp/$$.$file.bak
-    sed -e 's/DO NOT EDIT THIS FILE.*/This file was created automatically by glade and fixed by bootstrap/ ; s/#if.*ENABLE_NLS.*/#if defined( ENABLE_NLS ) \&\& defined ( HAVE_GETTEXT )/' < modules/gui/gtk/$file > /tmp/$$.$file.bak
-    mv -f /tmp/$$.$file.bak modules/gui/gtk/$file
-fi
-
 ##
 ##  Tell the user about gettext and sed
 ##