Sets EchoMode(QLineEdit::Password) for CONFIG_ITEM_PASSWORD

[vlc] / bootstrap

diff --git a/bootstrap b/bootstrap
index cff3fa98b2646f5b60c849f28cfb3eb6fffd144e..a19662e631ac38eb08d351180aeca78ea71b4117 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,11 +1,11 @@
 #! /bin/sh
 
 ##  bootstrap file for the VLC media player
 #! /bin/sh
 
 ##  bootstrap file for the VLC media player

-##  $Id$

 ##
 ##

-## Copyright (C) 2005 the VideoLAN team
+## Copyright (C) 2005-2006 the VideoLAN team

 ##
 ##

-##  Initial author: Sam Hocevar <sam@zoy.org>
+##  Authors: Sam Hocevar <sam@zoy.org>
+##           Rémi Denis-Courmont <rem # videolan # org>

 
 if test "$#" != "0"; then
   echo "Usage: $0"
 
 if test "$#" != "0"; then
   echo "Usage: $0"


@@ -31,12 +31,14 @@ set -x
 AUTOMAKESUCKS=no
 INSTALLSUCKS=no
 
 AUTOMAKESUCKS=no
 INSTALLSUCKS=no
 

-ACLOCAL_ARGS="-I m4"
+ACLOCAL_ARGS="-I m4 ${ACLOCAL_ARGS}"

 
 # Check for contrib directory
 if test -d extras/contrib/bin; then
 
 # Check for contrib directory
 if test -d extras/contrib/bin; then

-  export PATH=./extras/contrib/bin:$PATH
-  ACLOCAL_ARGS="${ACLOCAL_ARGS} -I extras/contrib/share/aclocal"
+  export PATH="`pwd`/extras/contrib/bin:$PATH"
+  if test -d extras/contrib/share/aclocal; then
+    ACLOCAL_ARGS="${ACLOCAL_ARGS} -I extras/contrib/share/aclocal"
+  fi

   if test ".`uname -s`" = ".Darwin"; then
     export LD_LIBRARY_PATH=./extras/contrib/lib:$LD_LIBRARY_PATH
     export DYLD_LIBRARY_PATH=./extras/contrib/lib:$DYLD_LIBRARY_PATH
   if test ".`uname -s`" = ".Darwin"; then
     export LD_LIBRARY_PATH=./extras/contrib/lib:$LD_LIBRARY_PATH
     export DYLD_LIBRARY_PATH=./extras/contrib/lib:$DYLD_LIBRARY_PATH


@@ -44,41 +46,70 @@ if test -d extras/contrib/bin; then
     export LIBRARY_PATH=./extras/contrib/lib:$LIBRARY_PATH
     export BELIBRARIES=./extras/contrib/lib:$BELIBRARIES
   fi
     export LIBRARY_PATH=./extras/contrib/lib:$LIBRARY_PATH
     export BELIBRARIES=./extras/contrib/lib:$BELIBRARIES
   fi

+elif test ".`uname -s`" = ".Darwin"; then
+  set +x
+  echo ""
+  echo "ERR: Contribs haven't been built"
+  echo "ERR: Please run:"
+  echo "ERR: "
+  echo "ERR:    'cd extras/contrib && ./bootstrap && make && cd ../..'"
+  echo "ERR: "
+  echo "ERR: Make sure fink has been disabled too."
+  echo ""
+  set -x
+  exit 1

 fi
 
 fi
 

+# Check for autoconf
+rm -f m4/autoconf260.m4
+case "$(autoconf --version|head -n 1)" in
+  *2.5[012345678]*)
+    echo "Hey, your autoconf is quite old. Update it." >&2
+    exit 1
+    ;;
+
+  *2.59*)
+    echo "Enabling provisional autoconf 2.59 work-around. Update autoconf ASAP."
+    cp -f extras/m4/autoconf260.m4 m4/
+    ;;
+esac
+

 # Check for automake
 # Check for automake

-amvers="none"
-if automake-1.9 --version >/dev/null 2>&1; then
-  amvers="-1.9"
-elif automake-1.8 --version >/dev/null 2>&1; then
-  amvers="-1.8"
-elif automake-1.7 --version >/dev/null 2>&1; then
-  amvers="-1.7"
-elif automake-1.6 --version >/dev/null 2>&1; then
-  amvers="-1.6"
-  if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" "<=" "1.6.1" > /dev/null 2>&1; then
-    AUTOMAKESUCKS=yes
+amvers="no"
+for v in "-1.10" "110" "-1.9" "19"; do
+  if automake${v} --version >/dev/null 2>&1; then
+    amsuff="${v}"
+    amvers="`echo ${v} | sed -e 's/^-//'`"
+    break

   fi
   fi

-elif automake-1.5 --version >/dev/null 2>&1; then
-  INSTALLSUCKS=yes
-  amvers="-1.5"
-elif automake --version > /dev/null 2>&1; then
-  amvers=""
-  case "`automake --version | sed -e '1s/[^0-9]*//' -e q`" in
-    0|0.*|1|1.[01234]|1.[01234][-.]*)
-      amvers="none" ;;
-    1.5|1.5.*)
-      INSTALLSUCKS=yes ;;
-    1.6|1.6.0|1.6.1)
-      AUTOMAKESUCKS=yes ;;
-    1.9|1.9.2)
-      ;;
-  esac
+done
+
+if test "${amvers}" = "no" && automake --version > /dev/null 2>&1; then
+  amvers="`automake --version | sed -e '1s/[^0-9]*//' -e q`"
+  amsuff=""
+fi
+
+case "${amvers}" in
+  no|1.[012345678]|1.[0123456].*|1[0123456]|1.[0123456]-*)
+    set +x
+    echo "$0: you need automake version 1.9 or later"
+    exit 1
+    ;;
+esac
+
+# Check for libtool
+libtoolize="no"
+if test -x extras/contrib/bin/libtoolize; then
+  libtoolize="extras/contrib/bin/libtoolize"
+elif glibtoolize --version >/dev/null 2>&1; then
+  libtoolize="glibtoolize"
+elif libtoolize --version >/dev/null 2>&1; then
+  libtoolize="libtoolize"

 fi
 
 fi
 

-if test "${amvers}" = "none"; then
+if test "$libtoolize" = "no"; then

   set +x
   set +x

-  echo "you need automake version 1.5 or later"
+  echo "$0: you need libtool"

   exit 1
 fi
 
   exit 1
 fi
 


@@ -108,8 +139,8 @@ else
   PKGCONFIG=no
 fi
 
   PKGCONFIG=no
 fi
 

-aclocal=aclocal${amvers}
-automake=automake${amvers}
+aclocal=aclocal${amsuff}
+automake=automake${amsuff}

 autoconf=autoconf
 autoheader=autoheader
 
 autoconf=autoconf
 autoheader=autoheader
 


@@ -127,8 +158,8 @@ dnl  Private VLC macros - generated by bootstrap
 EOF
 
 if [ "${PKGCONFIG}" = "no" ]; then cat >> m4/private.m4 << EOF
 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], [:], [], [], [])
+dnl  User does not have pkg-config, so assume package was not found
+AC_DEFUN([PKG_CHECK_MODULES],[ifelse([\$4], , :, [\$4])])

 
 EOF
 fi
 
 EOF
 fi


@@ -140,21 +171,7 @@ AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
 EOF
 fi
 
 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
-AC_DEFUN([VLC_CONDITIONALS], [
-EOF
-rm -f m4/private.m4-tmp2 && cat > m4/private.m4-tmp2 << EOF
-dnl  The required AC_SUBST calls
-AC_DEFUN([VLC_SUBSTS], [
-EOF
-rm -f m4/private.m4-tmp3 && cat > m4/private.m4-tmp3 << EOF
-dnl  The required AC_OUTPUT calls
-dnl  XXX: this feature is only supported starting from automake-1.7
-AC_DEFUN([VLC_MAKEFILES], [AC_OUTPUT([
-EOF
-rm -f m4/private.m4-tmp4 && cat > m4/private.m4-tmp4 << EOF
+cat >> m4/private.m4 << EOF

 dnl  Helper macro for vlc-config generation
 AC_DEFUN([VLC_CONFIG_HELPER], [
   cat >> vlc-config.in << BLAH
 dnl  Helper macro for vlc-config generation
 AC_DEFUN([VLC_CONFIG_HELPER], [
   cat >> vlc-config.in << BLAH


@@ -177,11 +194,10 @@ do
   # automake will not recurse for make dist if we don't define SUBDIRS = .
   subdirs="`sed -ne 's,'modules/${dir}'/\([^/]*\)/Makefile,\1,p' configure.ac | xargs`"
   mods="`sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < "${modf}" | xargs`"
   # automake will not recurse for make dist if we don't define SUBDIRS = .
   subdirs="`sed -ne 's,'modules/${dir}'/\([^/]*\)/Makefile,\1,p' configure.ac | xargs`"
   mods="`sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < "${modf}" | xargs`"

-  extra_libs=""
+  extra_ltlibs=""

   for mod in $mods
   do
   for mod in $mods
   do

-    extra_libs="${extra_libs} lib${mod}_plugin.a"
-    extra_libs="${extra_libs} lib${mod}.a lib${mod}_pic.a"
+    extra_ltlibs="${extra_ltlibs} lib${mod}_plugin.la"

   done
   rm -f "${makf}" && cat > "${makf}" << EOF
 
   done
   rm -f "${makf}" && cat > "${makf}" << EOF
 


@@ -192,34 +208,48 @@ basedir = ${basedir}
 mods = ${mods}
 
 NULL =
 mods = ${mods}
 
 NULL =

-libvlc_LIBRARIES =
-noinst_LIBRARIES =
-noinst_HEADERS =
+libvlc_LTLIBRARIES =

 EXTRA_DIST = Modules.am
 BUILT_SOURCES =
 EXTRA_DIST = Modules.am
 BUILT_SOURCES =

+CLEANFILES =

 SUBDIRS = ${subdirs}
 SUBDIRS = ${subdirs}

-SUFFIXES = _plugin\$(LIBEXT) _plugin.a
+SUFFIXES = _plugin\$(LIBEXT) _plugin.la

 
 libvlcdir = \$(libdir)/vlc/\$(basedir)
 
 
 libvlcdir = \$(libdir)/vlc/\$(basedir)
 

-EXTRA_LIBRARIES = ${extra_libs}
+EXTRA_LTLIBRARIES = ${extra_ltlibs}
+

 include Modules.am
 
 include Modules.am
 

+if HAVE_PLUGINS
+LTLIBVLC = -L\$(top_builddir)/src -lvlc
+
+AM_LDFLAGS = -rpath '\$(libvlcdir)' -avoid-version \\
+       -module -no-undefined -shrext \$(LIBEXT) 
+if HAVE_COMPILER_EXPORT
+AM_LDFLAGS += -export-dynamic
+else
+AM_LDFLAGS += -export-symbol-regex ^\$(VLC_ENTRY)\$\$
+endif
+AM_LIBADD = \$(LTLIBVLC)
+endif
+

 all: all-modules
 
 all: all-modules
 

+nice:
+       \$(top_builddir)/compile
+

 # Find out which modules were enabled and tell make to build them
 all-modules:
        @set fnord \$\$MAKEFLAGS; amf=\$\$2; targets=\`\\
 # Find out which modules were enabled and tell make to build them
 all-modules:
        @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; \\
-       if test "\$(pic)" == "pic"; then z=\$\$(\$(VLC_CONFIG) --list builtin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}_pic.a;; 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"
 
 # Build a plugin with the adequate linker and linker's flags
        \`; case "\$\$targets" in *lib*) \$(MAKE) \$(AM_MAKEFLAGS) \$\$targets || case "\$\$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; ;; esac; \\
        test -z "\$\$fail"
 
 # Build a plugin with the adequate linker and linker's flags

-_plugin.a_plugin\$(LIBEXT):
-       @mod="\$*" ; mod=\$\${mod:3} ; \
-       ldfl="\`\$(VLC_CONFIG) --libs plugin \$\$mod\` -u \$(SYMPREF)\$(VLC_ENTRY)" ; \
+_plugin.la_plugin\$(LIBEXT):
+       @mod="\$*" ; mod=\$\${mod#lib} ; \
+       ldfl="\`\$(VLC_CONFIG) --libs plugin \$\$mod\` \$(LIBVLC) -u \$(SYMPREF)\$(VLC_ENTRY)" ; \

        case \`\$(VLC_CONFIG) --linkage \$\$mod\` in \\
          c++)  ld="\$(CXXLINK)" ;; \
          objc) ld="\$(OBJCLINK)" ;; \
        case \`\$(VLC_CONFIG) --linkage \$\$mod\` in \\
          c++)  ld="\$(CXXLINK)" ;; \
          objc) ld="\$(OBJCLINK)" ;; \


@@ -228,76 +258,31 @@ _plugin.a_plugin\$(LIBEXT):
        echo \$\$ld \$< \$\$ldfl ; \
        \$\$ld \$< \$\$ldfl
 
        echo \$\$ld \$< \$\$ldfl ; \
        \$\$ld \$< \$\$ldfl
 

+if MAINTAINER_MODE

 \$(srcdir)/Makefile.am: \$(srcdir)/Modules.am \$(top_srcdir)/bootstrap
        cd \$(top_srcdir) && \$(SHELL) ./bootstrap
 \$(srcdir)/Makefile.am: \$(srcdir)/Modules.am \$(top_srcdir)/bootstrap
        cd \$(top_srcdir) && \$(SHELL) ./bootstrap

+endif

 
 mostlyclean-local:
 
 mostlyclean-local:

-       -rm -f *.a *\$(LIBEXT)
+       -rm -f -- *.la

 
 ### automake creates libvlcdir after running install-*-local
 ### so we have to create it ourselves first
 install-exec-local: all-modules
 
 ### automake creates libvlcdir after running install-*-local
 ### so we have to create it ourselves first
 install-exec-local: all-modules

-       mkdir -p -- "\$(DESTDIR)\$(libvlcdir)"
-       @z=\$\$(\$(VLC_CONFIG) --list plugin); \
-       for mod in \$(mods); do \
-         case "\$\$z " \
-           in *\ \$\${mod}\ *) \
-             echo \$(INSTALL_PROGRAM) "lib\$\${mod}_plugin\$(LIBEXT)" "\$(DESTDIR)\$(libvlcdir)/" ; \
-             \$(INSTALL_PROGRAM) "lib\$\${mod}_plugin\$(LIBEXT)" "\$(DESTDIR)\$(libvlcdir)/" || exit \$\$?; \
-             ;; \
-         esac; \
-       done
-       @z=\$\$(\$(VLC_CONFIG) --list builtin); \
-       for mod in \$(mods); do \
-         case "\$\$z " \
-           in *\ \$\${mod}\ *) \
-             echo \$(INSTALL_DATA) "lib\$\${mod}.a" "\$(DESTDIR)\$(libdir)/vlc/" ; \
-             \$(INSTALL_DATA) "lib\$\${mod}.a" "\$(DESTDIR)\$(libdir)/vlc/" || exit \$\$?; \
-             ;; \
-         esac; \
-       done
-if BUILD_MOZILLA
-       @z=\$\$(\$(VLC_CONFIG) --list builtin); \
-       for mod in \$(mods); do \
-         case "\$\$z " \
-           in *\ \$\${mod}\ *) \
-             echo \$(INSTALL_DATA) "lib\$\${mod}_pic.a" "\$(DESTDIR)\$(libdir)/vlc/" ; \
-             \$(INSTALL_DATA) "lib\$\${mod}_pic.a" "\$(DESTDIR)\$(libdir)/vlc/" || exit \$\$?; \
-             ;; \
-         esac; \
-       done
-endif
+       @if test -z "\$(libvlc_LTLIBRARIES)"; then \
+         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 \$\$? ; \
+       fi

 
 uninstall-local:
 
 uninstall-local:

-       @z=\$\$(\$(VLC_CONFIG) --list plugin); \
-       for mod in \$(mods); do \
-         case "\$\$z " \
-           in *\ \$\${mod}\ *) \
-             echo rm -f "\$(DESTDIR)\$(libvlcdir)/lib\$\${mod}_plugin\$(LIBEXT)" ; \
-             rm -f "\$(DESTDIR)\$(libvlcdir)/lib\$\${mod}_plugin\$(LIBEXT)" || true; \
-             ;; \
-         esac; \
-       done
-       @z=\$\$(\$(VLC_CONFIG) --list builtin); \
-       for mod in \$(mods); do \
-         case "\$\$z " \
-           in *\ \$\${mod}\ *) \
-             echo rm -f "\$(DESTDIR)\$(libdir)/vlc/lib\$\${mod}.a" ; \
-             rm -f "\$(DESTDIR)\$(libdir)/vlc/lib\$\${mod}.a" || true; \
-             ;; \
-         esac; \
-       done
-if BUILD_MOZILLA
-       @z=\$\$(\$(VLC_CONFIG) --list builtin); \
-       for mod in \$(mods); do \
-         case "\$\$z " \
-           in *\ \$\${mod}\ *) \
-             echo rm -f "\$(DESTDIR)\$(libdir)/vlc/lib\$\${mod}_pic.a" ; \
-             rm -f "\$(DESTDIR)\$(libdir)/vlc/lib\$\${mod}_pic.a" || true; \
-             ;; \
-         esac; \
-       done
-endif
+       @if test -z "\$(libvlc_LTLIBRARIES)"; then \
+         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 \$\$?; \
+       fi

 
 EOF
   for mod in $mods
 
 EOF
   for mod in $mods


@@ -305,7 +290,7 @@ EOF
     if grep '^nodist_SOURCES_'${mod}'' < "${modf}" >/dev/null 2>&1; then
         NODIST=''; else
         NODIST='#'; fi
     if grep '^nodist_SOURCES_'${mod}'' < "${modf}" >/dev/null 2>&1; then
         NODIST=''; else
         NODIST='#'; fi

-    cat >> m4/private.m4-tmp4 << EOF
+    cat >> m4/private.m4 << EOF

     ${mod}) list="\\\${list} ${dir}/lib${mod}" ;;
 EOF
 # Generation of modules/**/Makefile.am
     ${mod}) list="\\\${list} ${dir}/lib${mod}" ;;
 EOF
 # Generation of modules/**/Makefile.am


@@ -319,74 +304,31 @@ EOF
 # The ${mod} plugin
 
 EOF
 # The ${mod} plugin
 
 EOF

-    if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
-clean-local: clean-${mod}
-clean-${mod}:
-       -test -z "\$(nodist_SOURCES_${mod})" || rm -f \$(nodist_SOURCES_${mod})
-
-EOF
-    fi
-    if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
-BUILT_SOURCES += \$(B${mod})
-EOF
-    fi

     cat >> "${makf}" << EOF
     cat >> "${makf}" << EOF

-lib${mod}_plugin_a_SOURCES = \$(SOURCES_${mod})
+lib${mod}_plugin_la_SOURCES = \$(SOURCES_${mod})

 EOF
     if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
 EOF
     if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF

-nodist_lib${mod}_plugin_a_SOURCES = \$(nodist_SOURCES_${mod})
-EOF
-    fi
-    cat >> "${makf}" << EOF
-lib${mod}_plugin_a_CFLAGS = \`\$(VLC_CONFIG) --cflags plugin ${mod}\`
-lib${mod}_plugin_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags plugin ${mod}\`
-lib${mod}_plugin_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags plugin ${mod}\`
-
-lib${mod}_pic_a_SOURCES = \$(SOURCES_${mod})
-EOF
-    if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
-nodist_lib${mod}_pic_a_SOURCES = \$(nodist_SOURCES_${mod})
-EOF
-    fi
-    cat >> "${makf}" << EOF
-lib${mod}_pic_a_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin pic ${mod}\`
-lib${mod}_pic_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin pic ${mod}\`
-lib${mod}_pic_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin pic ${mod}\`
-
-lib${mod}_a_SOURCES = ${PRIVATE}\$(SOURCES_${mod})
-EOF
-    if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
-nodist_lib${mod}_a_SOURCES = ${PRIVATE}\$(nodist_SOURCES_${mod})
+nodist_lib${mod}_plugin_la_SOURCES = \$(nodist_SOURCES_${mod})
+CLEANFILES += \$(nodist_SOURCES_${mod})
+BUILT_SOURCES += \$(B${mod})

 EOF
     fi
     cat >> "${makf}" << EOF
 EOF
     fi
     cat >> "${makf}" << EOF

-lib${mod}_a_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin ${mod}\`
-lib${mod}_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin ${mod}\`
-lib${mod}_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin ${mod}\`
-
+lib${mod}_plugin_la_CFLAGS = \`\$(VLC_CONFIG) --cflags plugin ${mod}\`
+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}\` \$(AM_LDFLAGS)
+lib${mod}_plugin_la_LIBADD = \$(AM_LIBADD)

 EOF
   done
 done
 
 EOF
   done
 done
 

-cat >> m4/private.m4-tmp1 << EOF
-])
-EOF
-cat m4/private.m4-tmp1 >> m4/private.m4 && rm -f m4/private.m4-tmp1
-cat >> m4/private.m4-tmp2 << EOF
-])
-EOF
-cat m4/private.m4-tmp2 >> m4/private.m4 && rm -f m4/private.m4-tmp2
-cat >> m4/private.m4-tmp3 << EOF
-])])
-EOF
-cat m4/private.m4-tmp3 >> m4/private.m4 && rm -f m4/private.m4-tmp3
-cat >> m4/private.m4-tmp4 << EOF
+printf "\n"
+
+cat >> m4/private.m4 << EOF

 BLAH
 ])
 EOF
 BLAH
 ])
 EOF

-cat m4/private.m4-tmp4 >> m4/private.m4 && rm -f m4/private.m4-tmp4
-
-echo " done."

 
 ###
 ###  classic bootstrap stuff
 
 ###
 ###  classic bootstrap stuff


@@ -406,9 +348,7 @@ rm -f ltmain.sh libtool ltconfig
 # remove gettext cruft
 rm -f ABOUT-NLS
 rm -Rf intl
 # remove gettext cruft
 rm -f ABOUT-NLS
 rm -Rf intl

-# remove old vlc cruft
-rm -f m4/oldgettext.m4 stamp-pic configure.ac.in Modules.am
-# remove new vlc cruft
+# remove vlc cruft

 rm -f stamp-builtin stamp-h* mozilla/stamp-pic
 
 # Automake complains if these are not present
 rm -f stamp-builtin stamp-h* mozilla/stamp-pic
 
 # Automake complains if these are not present


@@ -419,19 +359,26 @@ if [ "$GETTEXT" != "yes" ]; then
   printf "" > ABOUT-NLS
 fi
 
   printf "" > ABOUT-NLS
 fi
 

+# Libtoolize directory
+${libtoolize} --copy --force
+if test -f "ltmain.sh"; then
+  echo "$0: working around a minor libtool issue"
+  mv ltmain.sh autotools/
+fi
+

 # Do the rest
 ${autopoint} -f
 # Do the rest
 ${autopoint} -f

+rm -f po/Makevars.template

 ${aclocal} ${ACLOCAL_ARGS}
 ${autoconf}
 ${autoheader}
 ${aclocal} ${ACLOCAL_ARGS}
 ${autoconf}
 ${autoheader}

-${automake} --add-missing --copy
+${automake} --add-missing --copy -Wall

 
 ##
 ##  files which need to be regenerated
 ##
 rm -f vlc-config.in vlc-config
 rm -f src/misc/modules_builtin.h
 
 ##
 ##  files which need to be regenerated
 ##
 rm -f vlc-config.in vlc-config
 rm -f src/misc/modules_builtin.h

-rm -f mozilla/vlcintf.h

 
 # Shut up
 set +x
 
 # Shut up
 set +x


@@ -439,7 +386,7 @@ set +x
 ##
 ##  Tell the user about gettext, pkg-config and sed
 ##
 ##
 ##  Tell the user about gettext, pkg-config and sed
 ##

-if [ "${GETTEXT}" == "old" ]; then
+if [ "${GETTEXT}" = "old" ]; then

   cat << EOF
 
 ==========================================================
   cat << EOF
 
 ==========================================================


@@ -448,10 +395,9 @@ system. The vlc build will work, but if your system does not
 have libintl you will not have internationalization support.
 We suggest upgrading to gettext 0.11.5 or later.
 EOF
 have libintl you will not have internationalization support.
 We suggest upgrading to gettext 0.11.5 or later.
 EOF

-  ;;

 fi
 
 fi
 

-if [ "$PKGCONFIG" == "no" ]; then
+if [ "$PKGCONFIG" = "no" ]; then

   cat << EOF
 
 ==============================================================
   cat << EOF
 
 ==============================================================


@@ -459,30 +405,5 @@ NOTE: you do not have the "pkg-config" utility on your system;
 detection of the Gtk-2.0 and GNOME 2.0 libraries will not be
 reliable.
 EOF
 detection of the Gtk-2.0 and GNOME 2.0 libraries will not be
 reliable.
 EOF

-  ;;
-fi
-
-if [ "$AUTOMAKESUCKS" == "yes" ]; then
-  cat << EOF
-
-=============================================================
-IMPORTANT NOTE: your version of automake has a bug which will
-prevent proper plugin compilation. Either compile VLC with
-the --disable-plugins flag, or use a version of automake newer
-than 1.6.1 (1.6.2 is OK, and so are the 1.5 series).
-EOF
-  ;;
-fi
-
-if [ "$INSTALLSUCKS" == "yes" ]; then
-  cat << EOF
-
-=============================================================
-IMPORTANT NOTE: your version of automake has a bug which will
-prevent proper installation. Do not use "make install" with this
-version of automake, or use a version of automake newer than 1.5
-(such as 1.6 or 1.7).
-EOF
-  ;;

 fi
 
 fi