* all: added s16tofixed32 filter, so that we decode flac with iPaq !

[vlc] / bootstrap

diff --git a/bootstrap b/bootstrap
index bcbea63ab4b2a21da41a557a053d6e99161acbb7..64a6f9926e76d4645896baf6e1eeb661751d4320 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 
-##  bootstrap file for vlc, the VideoLAN Client
-##  $Id: bootstrap,v 1.38 2002/12/26 10:55:35 massiot Exp $
+##  bootstrap file for the VLC media player
+##  $Id: bootstrap,v 1.44 2003/03/12 04:16:02 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
@@ -45,6 +45,8 @@ if test x`uname -s` = xDarwin; then ulimit -s 20000; fi
 
 printf "generating Modules.am and configure.ac"
 
+rm -f Modules.am configure.ac
+
 echo > Modules.am
 echo > configure.ac
 
@@ -155,7 +157,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
@@ -171,7 +173,7 @@ echo "done."
 ###  classic bootstrap stuff
 ###
 set -x
-rm -f aclocal.m4 m4/oldgettext.m4 configure config.guess config.log config.sub ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh
+rm -f aclocal.m4 m4/oldgettext.m4 configure config.guess config.log config.sub ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh ABOUT-NLS
 rm -Rf intl
 
 # Check for gettext
@@ -185,12 +187,14 @@ then
   GETTEXT=yes
 else
   # User's gettext is too old. try to continue anyway.
+  echo > ABOUT-NLS
   mkdir -p intl
   echo > intl/Makefile.am
   echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' > m4/oldgettext.m4
   GETTEXT=old
 fi;else
   # we don't have gettext. grmbl. try to continue anyway.
+  echo > ABOUT-NLS
   mkdir -p intl
   echo > intl/Makefile.am
   echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' > m4/oldgettext.m4
@@ -245,7 +249,7 @@ fi
 aclocal${amvers} -I m4 || exit 1
 autoheader || exit 1
 
-automake${amvers} --foreign --add-missing --copy || PERLSUCKS=yes
+automake${amvers} --add-missing --copy || PERLSUCKS=yes
 
 case "$PERLSUCKS" in
   no)
@@ -283,39 +287,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
 ##