* forwardport the mjpeg fix and the dvbsub color fixes

[vlc] / bootstrap

diff --git a/bootstrap b/bootstrap
index fdb2b8af097311bc79127915e76941edee06bd95..7fd6835a55c0d8e451dff41e15e114056fdde31d 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -241,13 +241,13 @@ nice:
 all-modules:
 if USE_LIBTOOL
        @set fnord \$\$MAKEFLAGS; amf=\$\$2; targets=\`\\
-       if test "\$(plugin)" != "no"; then z=\$\$(\$(VLC_CONFIG) --list builtin plugin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}_plugin.la;; esac; done; fi; \\
+       z=\$\$(\$(VLC_CONFIG) --list plugin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}_plugin.la;; esac; done; \\
        \`; case "\$\$targets" in *lib*) \$(MAKE) \$(AM_MAKEFLAGS) \$\$targets || case "\$\$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; ;; esac; \\
        test -z "\$\$fail"
 else
        @set fnord \$\$MAKEFLAGS; amf=\$\$2; targets=\`\\
-       if test "\$(plugin)" != "no"; then z=\$\$(\$(VLC_CONFIG) --list plugin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}_plugin\$(LIBEXT);; esac; done; fi; \\
-       if test "\$(builtin)" != "no"; then z=\$\$(\$(VLC_CONFIG) --list builtin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}.a;; esac; done; fi; \\
+       z=\$\$(\$(VLC_CONFIG) --list plugin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}_plugin\$(LIBEXT);; esac; done; \\
+       z=\$\$(\$(VLC_CONFIG) --list builtin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}.a;; esac; done; \\
        \`; case "\$\$targets" in *lib*) \$(MAKE) \$(AM_MAKEFLAGS) \$\$targets || case "\$\$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; ;; esac; \\
        test -z "\$\$fail"
 endif
@@ -287,7 +287,7 @@ clean-local: \$(clean_modules)
 install-exec-local: all-modules
 if USE_LIBTOOL
        @if test -z "\$(libvlc_LTLIBRARIES)"; then \
-         z=\$\$(\$(VLC_CONFIG) --list builtin plugin); \
+         z=\$\$(\$(VLC_CONFIG) --list plugin); \
          m=\`for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo -n " lib\$\${mod}_plugin.la" ;; esac; done\` ; \
          test -z "\$\$m" || \
            \$(MAKE) \$(AM_MAKEFLAGS) libvlc_LTLIBRARIES="\$\$m" install-libvlcLTLIBRARIES || exit \$\$? ; \
@@ -308,7 +308,7 @@ endif
 uninstall-local:
 if USE_LIBTOOL
        @if test -z "\$(libvlc_LTLIBRARIES)"; then \
-         z=\$\$(\$(VLC_CONFIG) --list builtin plugin); \
+         z=\$\$(\$(VLC_CONFIG) --list plugin); \
          m=\`for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo -n " lib\$\${mod}_plugin.la" ;; esac; done\` ; \
          test -z "\$\$m" || \
            \$(MAKE) \$(AM_MAKEFLAGS) libvlc_LTLIBRARIES="\$\$m" uninstall-libvlcLTLIBRARIES || exit \$\$?; \
@@ -374,7 +374,7 @@ lib${mod}_plugin_la_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags plugin ${mod}\`
 lib${mod}_plugin_la_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags plugin ${mod}\`
 lib${mod}_plugin_la_LDFLAGS = \`\$(VLC_CONFIG) --libs plugin ${mod}\` \\
        -rpath '\$(libvlcdir)' -avoid-version -module -shrext \$(LIBEXT) \\
-       -export-symbol-regex ^\$(VLC_ENTRY)\$\$
+       -export-symbol-regex ^\$(VLC_ENTRY)\$\$ -no-undefined
 lib${mod}_plugin_la_LIBADD = \$(LTLIBVLC)
 
 lib${mod}_a_SOURCES = \$(SOURCES_${mod})