* modules/demux/mkv.cpp: Set English as the default for track language.

[vlc] / bootstrap

diff --git a/bootstrap b/bootstrap
index d2bc5cfbe08dce8e9bef219f318dba2586260be5..7e0213dd25d74956cf1a78a4eaf94de1be7699e5 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  bootstrap file for the VLC media player
-##  $Id: bootstrap,v 1.74 2003/10/23 15:30:22 sam Exp $
+##  $Id: bootstrap,v 1.80 2003/10/26 14:49:26 sam Exp $
 ##
 ##  Authors: Sam Hocevar <sam@zoy.org>
 
@@ -78,11 +78,6 @@ else
   echo > ABOUT-NLS
   mkdir -p intl
   echo > intl/Makefile.am
-  cat >> m4/private.m4 << EOF
-dnl  User's gettext is too old, so this is a no-op
-AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
-
-EOF
   autopoint=:
   GETTEXT=old
 fi;else
@@ -90,11 +85,6 @@ fi;else
   echo > ABOUT-NLS
   mkdir -p intl
   echo > intl/Makefile.am
-  cat >> m4/private.m4 << EOF
-dnl  User does not have gettext, so this is a no-op
-AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
-
-EOF
   autopoint=:
   GETTEXT=no
 fi
@@ -104,12 +94,6 @@ if pkg-config --version >/dev/null 2>&1; then
   # We have pkg-config, everything is cool.
   PKGCONFIG=yes
 else
-  # Not present, use a workaround.
-  cat >> m4/private.m4 << EOF
-dnl  User does not have pkg-config, so this is a no-op
-AC_DEFUN([PKG_CHECK_MODULES], [:])
-
-EOF
   PKGCONFIG=no
 fi
 
@@ -130,6 +114,21 @@ rm -f m4/private.m4 && cat > m4/private.m4 << EOF
 dnl  Private VLC macros - generated by bootstrap
 
 EOF
+
+if [ "${PKGCONFIG}" = "no" ]; then cat >> m4/private.m4 << EOF
+dnl  User does not have pkg-config, so this is a no-op
+AC_DEFUN([PKG_CHECK_MODULES], [:], [], [], [])
+
+EOF
+fi
+
+if [ "${GETTEXT}" != "yes" ]; then cat >> m4/private.m4 << EOF
+dnl  User does not have gettext, so this is a no-op
+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
+
+EOF
+fi
+
 rm -f m4/private.m4-tmp1 && cat > m4/private.m4-tmp1 << EOF
 dnl  The required AM_CONDITIONAL calls
 dnl  XXX: too many conditionals make the build very slow, disabled them
@@ -181,16 +180,28 @@ SUBDIRS = ${subdirs}
 libvlcdir = \$(libdir)/vlc/${basedir}
 include Modules.am
 
+if BUILD_MOZILLA
 if HAVE_WIN32
 # There's no need for pic code on win32 so get rid of this to substantially
 # reduce the compilation time.
 pic = no
 endif
+else
+pic = no
+endif
 
-clean: clean-local
 clean-local:
        -rm -f *.a *.so *.dll *.sl *.dylib
 
+all: all-modules
+all-modules:
+       @set fnord \$\$MAKEFLAGS; amf=\$\$2; targets=\`\\
+       if test "\$(plugin)" != "no"; then z=\$\$(\$(VLC_CONFIG) --target plugin); for mod in `sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < ${mf} | xargs`; do case "\$\$z" in */lib\$\${mod}_plugin*) echo lib\$\${mod}_plugin\$(LIBEXT);; esac; done; fi; \\
+       if test "\$(builtin)" != "no"; then z=\$\$(\$(VLC_CONFIG) --target builtin); for mod in `sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < ${mf} | xargs`; do case "\$\$z" in */lib\$\${mod}.a*) echo lib\$\${mod}.a;; esac; done; fi; \\
+       if test "\$(pic)" != "no"; then z=\$\$(\$(VLC_CONFIG) --target builtin pic); for mod in `sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < ${mf} | xargs`; do case "\$\$z" in */lib\$\${mod}_pic.a*) echo lib\$\${mod}_pic.a;; esac; done; fi; \\
+       \`; case "\$\$targets" in *lib*) \$(MAKE) \$(AM_MAKEFLAGS) \$\$targets || case "\$\$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; ;; esac; \\
+       test -z "\$\$fail"
+
 EOF
   for mod in `sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < ${mf}`
   do
@@ -216,46 +227,16 @@ EOF
 #   work properly with any automake version I tested.
     cat >> modules/${dir}/Makefile.am << EOF
 # The ${mod} plugin
-clean: clean-${mod}
-all: all-${mod}
 
 EOF
     if [ "${NODIST}" != "#" ]; then cat >> modules/${dir}/Makefile.am << EOF
+clean-local: clean-${mod}
 clean-${mod}:
        -test -z "\$(nodist_SOURCES_${mod})" || rm -f \$(nodist_SOURCES_${mod})
 
 EOF
     fi
     cat >> modules/${dir}/Makefile.am << EOF
-all-${mod}:
-if BUILD_MOZILLA
-       @set fnord \$\$MAKEFLAGS; amf=\$\$2; \\
-       if test "\$(plugin)" != "no" \\
-           && \$(VLC_CONFIG) --target plugin | grep "${dir}/lib${mod}_plugin" >/dev/null 2>&1; then \\
-         \$(MAKE) \$(AM_MAKEFLAGS) lib${mod}_plugin\$(LIBEXT) || case "\$\$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \\
-       fi; \\
-       if test "\$(builtin)" != "no" \\
-           && \$(VLC_CONFIG) --target builtin | grep "${dir}/lib${mod}\\.a" >/dev/null 2>&1; then \\
-         \$(MAKE) \$(AM_MAKEFLAGS) lib${mod}.a || case "\$\$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \\
-       fi; \\
-       if test "\$(pic)" != "no" \\
-           && \$(VLC_CONFIG) --target builtin pic | grep "${dir}/lib${mod}_pic\\.a" >/dev/null 2>&1; then \\
-         \$(MAKE) \$(AM_MAKEFLAGS) lib${mod}_pic.a || case "\$\$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \\
-       fi; \\
-       test -z "\$\$fail"
-else
-       @set fnord \$\$MAKEFLAGS; amf=\$\$2; \\
-       if test "\$(plugin)" != "no" \\
-           && \$(VLC_CONFIG) --target plugin | grep "${dir}/lib${mod}_plugin" >/dev/null 2>&1; then \\
-         \$(MAKE) \$(AM_MAKEFLAGS) lib${mod}_plugin\$(LIBEXT) || case "\$\$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \\
-       fi; \\
-       if test "\$(builtin)" != "no" \\
-           && \$(VLC_CONFIG) --target builtin | grep "${dir}/lib${mod}\\.a" >/dev/null 2>&1; then \\
-         \$(MAKE) \$(AM_MAKEFLAGS) lib${mod}.a || case "\$\$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \\
-       fi; \\
-       test -z "\$\$fail"
-endif
-
 if UNTRUE
 L${mod}p = lib${mod}_plugin.a
 D${mod}p = lib${mod}_plugin\$(LIBEXT)