X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=1223b2014cae27d35e8ac90d4273f382a30ed4e8;hb=2a937a32600b44bde6a2143ace54484a86b41594;hp=16d79aba3f34a1a62b9740997a37171af6a7c472;hpb=2799d36bc8abdc28df29a202acdb27223b25a7a7;p=vlc

diff --git a/bootstrap b/bootstrap
index 16d79aba3f..1223b2014c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,343 +1,467 @@
 #! /bin/sh
 
-##  bootstrap file for vlc, the VideoLAN Client
-##  $Id: bootstrap,v 1.14 2002/09/30 11:05:32 sam Exp $
+##  bootstrap file for the VLC media player
+##  $Id$
 ##
-##  Authors: Samuel Hocevar <sam@zoy.org>
+##  Authors: Sam Hocevar <sam@zoy.org>
+
+if test "$#" != "0"; then
+  echo "Usage: $0"
+  echo "  Calls automake, autoconf, autoheader, autopoint and other auto* to generate"
+  echo "  m4 macros and prepare Makefiles."
+  exit 1
+fi
 
 ###
-###  get a sane environment
+###  Get a sane environment, just in case
 ###
 LANG=C
 export LANG
+CYGWIN=binmode
+export CYGWIN
 
-###
-###  argument check
-###
-do_po=no
-while test $# -gt 0; do
-  case "$1" in
-    --update-po)
-      do_po=yes
-      ;;
-    *)
-      echo "unknown option $1"
-      ;;
-  esac
-  shift
-done
+set -e
+set -x
 
 ##
-## Check that our tools don't suck
+## Check for various tools
 ##
-SEDSUCKS=no
-if test ! 20000 -eq `perl -e 'printf "%s\n","a"x20000' | sed -e 's/.//' 2>/dev/null | wc -c`
-then
-  SEDSUCKS=yes
+AUTOMAKESUCKS=no
+INSTALLSUCKS=no
+
+ACLOCAL_ARGS="-I m4"
+
+# 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"
+  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
+  elif test ".`uname -s`" = ".BeOS"; then
+    export LIBRARY_PATH=./extras/contrib/lib:$LIBRARY_PATH
+    export BELIBRARIES=./extras/contrib/lib:$BELIBRARIES
+  fi
 fi
 
-PERLSUCKS=no
+# Check for automake
+amvers="none"
+if automake-1.8 --version >/dev/null 2>&1; then
+  amvers="-1.8"
+  # If we also have 1.6 (>> 1.6.1), use it instead because it is faster
+  if automake-1.6 --version >/dev/null 2>&1; then
+    if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" ">" "1.6.1" > /dev/null 2>&1; then
+      amvers="-1.6"
+    fi
+  fi
+elif automake-1.9 --version >/dev/null 2>&1; then
+  amvers="-1.9"
+  # If we also have 1.6 (>> 1.6.1), use it instead because it is faster
+  if automake-1.6 --version >/dev/null 2>&1; then
+    if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" ">" "1.6.1" > /dev/null 2>&1; then
+      amvers="-1.6"
+    fi
+  fi
+elif automake-1.7 --version >/dev/null 2>&1; then
+  amvers="-1.7"
+  # If we also have 1.6 (>> 1.6.1), use it instead because it is faster
+  if automake-1.6 --version >/dev/null 2>&1; then
+    if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" ">" "1.6.1" > /dev/null 2>&1; then
+      amvers="-1.6"
+    fi
+  fi
+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
+  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
+fi
+
+if test "${amvers}" = "none"; then
+  set +x
+  echo "you need automake version 1.5 or later"
+  exit 1
+fi
+
+# Check for gettext
+if gettextize --version >/dev/null 2>&1; then
+# Autopoint is available from 0.11.3, but we need 0.11.5
+if expr `gettextize --version | sed -e '1s/[^0-9]*//' -e q` \
+        '>=' 0.11.5 >/dev/null 2>&1; then
+  # We have gettext, and a recent version! Everything is cool.
+  autopoint=autopoint
+  GETTEXT=yes
+else
+  # User's gettext is too old. try to continue anyway.
+  autopoint=:
+  GETTEXT=old
+fi;else
+  # we don't have gettext. grmbl. try to continue anyway.
+  autopoint=:
+  GETTEXT=no
+fi
+
+# Check for pkg-config
+if pkg-config --version >/dev/null 2>&1; then
+  # We have pkg-config, everything is cool.
+  PKGCONFIG=yes
+else
+  PKGCONFIG=no
+fi
+
+aclocal=aclocal${amvers}
+automake=automake${amvers}
+autoconf=autoconf
+autoheader=autoheader
 
 ##
 ## Generate the modules makefile, by parsing modules/**/Modules.am
 ##
 
-printf "generating Modules.am and configure.ac"
+set +x
+echo "generating modules/**/Makefile.am and m4/private.m4"
 
-echo > Modules.am
-echo > configure.ac
+# Prepare m4/private.m4
+rm -f m4/private.m4 && cat > m4/private.m4 << EOF
+dnl  Private VLC macros - generated by bootstrap
 
-ALL_FLAGS="`sed -n -e '/^[^=A-Z]*[A-Z]*FLAGS_[^=]*=/s/[^=A-Z]*\([A-Z]*FLAGS_[^=]*=\).*/\1/p' < configure.ac.in | sort | uniq`"
+EOF
 
-cat >> configure.ac << EOF
-dnl ################################################################
-dnl # Do not edit this file, it was generated from configure.ac.in #
-dnl ################################################################
+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
-sed -n -e '/dnl do not touch this line/q;p' < configure.ac.in >> configure.ac
+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
+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
+dnl  Helper macro for vlc-config generation
+AC_DEFUN([VLC_CONFIG_HELPER], [
+  cat >> vlc-config.in << BLAH
+EOF
 
 modules=""
-for mf in `sed -ne 's@[^a-z]*\([^ ]*\)am.*@modules/\1am@p' < modules/Makefile.am`
+
+rm -f modules/Makefile.am && cat > modules/Makefile.am << EOF
+# Autogenerated by bootstrap - DO NOT EDIT
+EXTRA_DIST = LIST
+SUBDIRS = `sed -ne 's,modules/\([^/]*\)/Makefile,\1,p' configure.ac | xargs`
+#DIST_SUBDIRS = \$(SUBDIRS)
+EOF
+
+for dir in `sed -ne 's,modules/\(.*\)/Makefile,\1,p' configure.ac`
 do
   printf "."
-  dir=`echo ${mf} | sed -e 's@\(.*\)/.*@\1@'`
-  topdir=`echo ${dir} | cut -f2 -d/`
-  sym=`echo ${dir} | sed -e 'y@/@_@'`
-  cat >> Modules.am << EOF
-# Directory ${dir}
+  mf="modules/${dir}/Modules.am"
+  basedir="`echo "${dir}" | cut -f1 -d/`"
+  # 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`"
+  rm -f modules/${dir}/Makefile.am && cat > modules/${dir}/Makefile.am << EOF
+
+# Autogenerated by bootstrap - DO NOT EDIT - edit Modules.am instead
+
+NULL =
+libvlc_LIBRARIES =
+noinst_LIBRARIES =
+noinst_HEADERS =
+EXTRA_DIST = Modules.am
+BUILT_SOURCES =
+SUBDIRS = ${subdirs}
+#DIST_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-local:
+	-rm -f *.a *.so *.dll *.sl *.dylib
 
-include ${dir}/Modules.am
+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
-  sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < ${mf} | while read mod
+  for mod in `sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < ${mf}`
   do
-    if echo "$ALL_FLAGS" | grep '^CPPFLAGS_'${mod}'=$' >/dev/null 2>&1; then
-        echo "AC_SUBST(CPPFLAGS_${mod})" >> configure.ac; fi
-    if echo "$ALL_FLAGS" | grep '^CFLAGS_'${mod}'=$' >/dev/null 2>&1; then
-        echo "AC_SUBST(CFLAGS_${mod})" >> configure.ac; fi
-    if echo "$ALL_FLAGS" | grep '^CXXFLAGS_'${mod}'=$' >/dev/null 2>&1; then
-        echo "AC_SUBST(CXXFLAGS_${mod})" >> configure.ac; fi
-    if echo "$ALL_FLAGS" | grep '^OBJCFLAGS_'${mod}'=$' >/dev/null 2>&1; then
-        echo "AC_SUBST(OBJCFLAGS_${mod})" >> configure.ac; fi
-    if echo "$ALL_FLAGS" | grep '^LDFLAGS_'${mod}'=$' >/dev/null 2>&1; then
-        echo "AC_SUBST(LDFLAGS_${mod})" >> configure.ac; fi
     if grep '^SOURCES_'${mod}'.*=.*PRIVATE' < ${mf} >/dev/null 2>&1; then
         PRIVATE='#'; else
         PRIVATE=''; fi
     if grep '^nodist_SOURCES_'${mod}'' < ${mf} >/dev/null 2>&1; then
         NODIST=''; else
         NODIST='#'; fi
-    cat >> configure.ac << EOF
-AM_CONDITIONAL(${mod}_plugin, test x\$${mod}_plugin = xyes)
-AM_CONDITIONAL(${mod}_builtin, test x\$${mod}_builtin = xyes)
+#    cat >> m4/private.m4-tmp1 << EOF
+#dnl  AM_CONDITIONAL(${mod}_p, test x\$${mod}_p = xyes)
+#dnl  AM_CONDITIONAL(${mod}_b, test x\$${mod}_b = xyes)
+#EOF
+    cat >> m4/private.m4-tmp4 << EOF
+    ${mod}) list="\\\${list} ${dir}/lib${mod}" ;;
 EOF
-# L_ is for LIBRARIES_, D_ for DATA_, B_ for BUILT_SOURCES_, F_ for LDFLAGS_
-# _p is for _plugin, _b is for _builtin
-    cat >> Modules.am << EOF
+# Generation of modules/**/Makefile.am
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# - L_ is for LIBRARIES_, D_ for DATA_, B_ for BUILT_SOURCES_, F_ for LDFLAGS_,
+#   S_ for SOURCES_, _p is for _plugin, _b is for _builtin. This is to reduce
+#   the resulting file size.
+# - *_CFLAGS, *_CXXFLAGS etc. because per-object CPPFLAGS does not seem to
+#   work properly with any automake version I tested.
+    cat >> modules/${dir}/Makefile.am << EOF
 # The ${mod} plugin
 
-if ${mod}_plugin
-L_${mod}_p = ${dir}/lib${mod}_plugin.a
-D_${mod}_p = ${dir}/lib${mod}_plugin\$(LIBEXT)
-${NODIST}B_${mod}_p = \$(nodist_SOURCES_${mod})
-endif
-if ${mod}_builtin
-L_${mod}_b = ${dir}/lib${mod}.a
-F_${mod}_b = \$(LDFLAGS_${mod})
-if BUILD_MOZILLA
-L_${mod}_pic = ${dir}/lib${mod}_pic.a
-endif
-${NODIST}B_${mod}_b = \$(nodist_SOURCES_${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
+if UNTRUE
+L${mod}p = lib${mod}_plugin.a
+D${mod}p = lib${mod}_plugin\$(LIBEXT)
+L${mod}b = lib${mod}.a
+L${mod}pic = lib${mod}_pic.a
+EOF
+    if [ "${NODIST}" != "#" ]; then cat >> modules/${dir}/Makefile.am << EOF
+B${mod} = \$(nodist_SOURCES_${mod})
+EOF
+    fi
+    cat >> modules/${dir}/Makefile.am << EOF
 endif
 
-L_builtin += \$(L_${mod}_b)
-L_builtin_pic += \$(L_${mod}_pic)
-LDFLAGS_builtin += \$(F_${mod}_b)
-${PRIVATE}BUILT_SOURCES += \$(B_${mod}_p) \$(B_${mod}_b)
-
-${PRIVATE}${sym}_lib${mod}_plugin_a_SOURCES = \$(SOURCES_${mod})
-${NODIST}${PRIVATE}nodist_${sym}_lib${mod}_plugin_a_SOURCES = \$(nodist_SOURCES_${mod})
-${sym}_lib${mod}_plugin_a_CPPFLAGS = \$(CPPFLAGS_plugin) \$(CPPFLAGS_${mod}) -DMODULE_NAME=${mod} -DMODULE_NAME_IS_${mod}
-${sym}_lib${mod}_plugin_a_CFLAGS = \$(CFLAGS_plugin) \$(CFLAGS_${mod}) \$(${sym}_lib${mod}_plugin_a_CPPFLAGS)
-${sym}_lib${mod}_plugin_a_CXXFLAGS = \$(CXXFLAGS_plugin) \$(CXXFLAGS_${mod}) \$(${sym}_lib${mod}_plugin_a_CPPFLAGS)
-${sym}_lib${mod}_plugin_a_OBJCFLAGS = \$(OBJCFLAGS_plugin) \$(OBJCFLAGS_${mod}) \$(${sym}_lib${mod}_plugin_a_CPPFLAGS)
-
-${sym}_lib${mod}_pic_a_SOURCES = ${PRIVATE}\$(SOURCES_${mod})
-${NODIST}nodist_${sym}_lib${mod}_pic_a_SOURCES = ${PRIVATE}\$(nodist_SOURCES_${mod})
-${sym}_lib${mod}_pic_a_CPPFLAGS = \$(CPPFLAGS_builtin_pic) \$(CPPFLAGS_${mod}) -DMODULE_NAME=${mod} -DMODULE_NAME_IS_${mod}
-${sym}_lib${mod}_pic_a_CFLAGS = \$(CFLAGS_builtin_pic) \$(CFLAGS_${mod}) \$(${sym}_lib${mod}_pic_a_CPPFLAGS)
-${sym}_lib${mod}_pic_a_CXXFLAGS = \$(CXXFLAGS_builtin_pic) \$(CXXFLAGS_${mod}) \$(${sym}_lib${mod}_pic_a_CPPFLAGS)
-${sym}_lib${mod}_pic_a_OBJCFLAGS = \$(OBJCFLAGS_builtin_pic) \$(OBJCFLAGS_${mod}) \$(${sym}_lib${mod}_pic_a_CPPFLAGS)
-
-${sym}_lib${mod}_a_SOURCES = ${PRIVATE}\$(SOURCES_${mod})
-${NODIST}nodist_${sym}_lib${mod}_a_SOURCES = ${PRIVATE}\$(nodist_SOURCES_${mod})
-${sym}_lib${mod}_a_CPPFLAGS = \$(CPPFLAGS_builtin) \$(CPPFLAGS_${mod}) -DMODULE_NAME=${mod} -DMODULE_NAME_IS_${mod}
-${sym}_lib${mod}_a_CFLAGS = \$(CFLAGS_builtin) \$(CFLAGS_${mod}) \$(${sym}_lib${mod}_a_CPPFLAGS)
-${sym}_lib${mod}_a_CXXFLAGS = \$(CXXFLAGS_builtin) \$(CXXFLAGS_${mod}) \$(${sym}_lib${mod}_a_CPPFLAGS)
-${sym}_lib${mod}_a_OBJCFLAGS = \$(OBJCFLAGS_builtin) \$(OBJCFLAGS_${mod}) \$(${sym}_lib${mod}_a_CPPFLAGS)
-
-libvlc_LIBRARIES += \$(L_${mod}_b) \$(L_${mod}_pic)
-lib${mod}_DATA = \$(D_${mod}_p)
+EOF
+    if [ "${NODIST}" != "#" ]; then cat >> modules/${dir}/Makefile.am << EOF
+${PRIVATE}BUILT_SOURCES += \$(B${mod})
+EOF
+    fi
+    cat >> modules/${dir}/Makefile.am << EOF
+${PRIVATE}lib${mod}_plugin_a_SOURCES = \$(SOURCES_${mod})
+EOF
+    if [ "${NODIST}" != "#" ]; then cat >> modules/${dir}/Makefile.am << EOF
+${PRIVATE}nodist_lib${mod}_plugin_a_SOURCES = \$(nodist_SOURCES_${mod})
+EOF
+    fi
+    cat >> modules/${dir}/Makefile.am << 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 = ${PRIVATE}\$(SOURCES_${mod})
+EOF
+    if [ "${NODIST}" != "#" ]; then cat >> modules/${dir}/Makefile.am << EOF
+nodist_lib${mod}_pic_a_SOURCES = ${PRIVATE}\$(nodist_SOURCES_${mod})
+EOF
+    fi
+    cat >> modules/${dir}/Makefile.am << 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 >> modules/${dir}/Makefile.am << EOF
+nodist_lib${mod}_a_SOURCES = ${PRIVATE}\$(nodist_SOURCES_${mod})
+EOF
+    fi
+    cat >> modules/${dir}/Makefile.am << 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}\`
+
+libvlc_LIBRARIES += \$(L${mod}b) \$(L${mod}pic)
+lib${mod}_DATA = \$(D${mod}p)
 
 lib${mod}dir = \$(libdir)/vlc/${topdir}
-MOSTLYCLEANFILES += \$(D_${mod}_p)
-${PRIVATE}noinst_LIBRARIES += \$(L_${mod}_p)
-${PRIVATE}${dir}/lib${mod}_plugin\$(LIBEXT): \$(${sym}_lib${mod}_plugin_a_OBJECTS)
-${PRIVATE}	\$(CC) \$^ -o \$@ -shared \$(LDFLAGS) \$(LDFLAGS_plugins) \$(LDFLAGS_${mod})
+${PRIVATE}noinst_LIBRARIES += \$(L${mod}p)
+${PRIVATE}lib${mod}_plugin\$(LIBEXT): \$(lib${mod}_plugin_a_OBJECTS)
+${PRIVATE}	@case \`\$(VLC_CONFIG) --linkage ${mod}\` in \\
+${PRIVATE}	  c++) echo \$(CXXLINK) \$(lib${mod}_plugin_a_OBJECTS) \\\`\$(VLC_CONFIG) --libs plugin ${mod}\\\` ; \$(CXXLINK) \$(lib${mod}_plugin_a_OBJECTS) \`\$(VLC_CONFIG) --libs plugin ${mod}\` ;; \\
+${PRIVATE}	  objc) echo \$(OBJCLINK) \$(lib${mod}_plugin_a_OBJECTS) \\\`\$(VLC_CONFIG) --libs plugin ${mod}\\\` ; \$(OBJCLINK) \$(lib${mod}_plugin_a_OBJECTS) \`\$(VLC_CONFIG) --libs plugin ${mod}\` ;; \\
+${PRIVATE}	  c|*) echo \$(LINK) \$(lib${mod}_plugin_a_OBJECTS) \\\`\$(VLC_CONFIG) --libs plugin ${mod}\\\` ; \$(LINK) \$(lib${mod}_plugin_a_OBJECTS) \`\$(VLC_CONFIG) --libs plugin ${mod}\` ;; \\
+${PRIVATE}	esac
 
 
 EOF
   done
 done
 
-sed -n -e '/dnl do not touch this line/,//p' < configure.ac.in >> configure.ac
+cat >> m4/private.m4-tmp1 << EOF
+  AM_CONDITIONAL(UNTRUE, false)
+])
+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
+BLAH
+])
+EOF
+cat m4/private.m4-tmp4 >> m4/private.m4 && rm -f m4/private.m4-tmp4
 
-echo "done."
+echo " done."
 
 ###
 ###  classic bootstrap stuff
 ###
 set -x
-rm -f aclocal.m4 configure config.guess config.log config.sub ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh
-
-# Check for gettext
-if gettextize --version >/dev/null 2>&1
-then
-if expr `gettextize --version | sed -e '1s/[^0-9]*//' -e q` \
-        '>' 0.11.3 >/dev/null 2>&1
-then
-  # We have gettext, and a recent version! Everything is cool.
-  autopoint --force || exit 1
-  GETTEXT=yes
-else
-  # What?! User is not using a recent version of gettext? We'll have to
-  # cheat a bit, then.
-  rm -f po/ChangeLog~
-  gettextize --copy --force | grep '^from the' | cut -f3 -d' '
-  test -f po/ChangeLog~ && mv -f po/ChangeLog~ po/ChangeLog
-  # Yuck!
-  mkdir -p intl
-  test -f intl/Makefile.am || echo > intl/Makefile.am
-  # Yuck!
-  echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' > m4/oldgettext.m4
-  GETTEXT=old
-fi;else
-  # we don't have gettext. grmbl. try to continue anyway.
-  mkdir -p intl
-  echo > intl/Makefile.am
-  echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' > m4/oldgettext.m4
-  GETTEXT=no
-fi
 
-# Check for automake
-amvers="none"
-if automake-1.6 --version >/dev/null 2>&1
-then
-  amvers="-1.6"
-else
-  if automake-1.5 --version >/dev/null 2>&1
-  then
-    amvers="-1.5"
-  else
-    if automake --version > /dev/null 2>&1
-    then
-      amvers=`automake --version | sed -e '1s/[^0-9]*//' -e q`
-
-      if expr "$amvers" "<" "1.5" > /dev/null 2>&1
-      then amvers="none"
-      else amvers=""
-      fi
-    fi
-  fi
-fi
-
-if test x$amvers = xnone
-then
-  set +x
-  echo "you need automake version 1.5 or later"
-  exit 1
+# remove autotools cruft
+rm -f aclocal.m4 configure config.log config.h config.h.in
+rm -Rf autom4te.cache
+# remove old autotools extra cruft
+rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh
+# remove new autotools extra cruft
+rm -Rf autotools
+mkdir autotools
+# remove libtool cruft
+rm -f ltmain.sh libtool ltconfig
+# 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
+rm -f stamp-builtin stamp-h* mozilla/stamp-pic
+
+# Automake complains if these are not present
+rm -f vlc-config.in && printf "" > vlc-config.in
+if [ "$GETTEXT" != "yes" ]; then
+  test -d intl || mkdir intl
+  printf "" > intl/Makefile.am
+  printf "" > ABOUT-NLS
 fi
 
 # Do the rest
-aclocal${amvers} -I m4 || exit 1
-autoheader || exit 1
-
-automake${amvers} --foreign --add-missing --copy || PERLSUCKS=yes
-
-case "$PERLSUCKS" in
-  no)
-  ;;
-  yes)
-    set +x
-    echo ""
-    echo "==========================================================="
-    echo "IMPORTANT NOTE: automake failed. On certain systems this is"
-    echo "because of insufficient stack size. Please set the stack"
-    echo "size to something bigger or unlimited (\`unlimit stacksize')"
-    echo "and try again."
-    exit 1
-  ;;
-esac
-
-# Wrap automake's long lines, because the Solaris sed doesn't support lines
-# longer than 3999 characters, and ./configure calls sed. We use Perl instead
-# of sed for obvious reasons :)
-perl -ne 'if(/^.{500}/) {s/(.{200}[^ ]* )/$1\\\n\t/g} print $_' < Makefile.in > Makefile.in.tmp && mv Makefile.in.tmp Makefile.in
-
-autoconf || exit 1
+${autopoint} -f
+${aclocal} ${ACLOCAL_ARGS}
+${autoconf}
+${autoheader}
+${automake} --add-missing --copy
 
 ##
-##  Shut up
+##  files which need to be regenerated
 ##
-set +x
+rm -f vlc-config.in vlc-config
+rm -f src/misc/modules_builtin.h src/misc/modules_plugin.h
+rm -f include/vlc_symbols.h
+rm -f mozilla/vlcintf.h
 
-##
-##  headers which need to be regenerated because of the VLC_EXPORT macro
-##
-files="src/misc/modules_builtin.h src/misc/modules_plugin.h include/vlc_symbols.h"
-for file in src/misc/modules_builtin.h src/misc/modules_plugin.h include/vlc_symbols.h mozilla/vlcintf.h
-do
-  echo "touching $file"
-  echo > $file
-done
+# Shut up
+set +x
 
 ##
-##  Glade sometimes sucks
+##  Tell the user about gettext, pkg-config and sed
 ##
-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
+case "${GETTEXT}" in
+  yes) ;;
+  no) cat << EOF
+
+===========================================================
+IMPORTANT NOTE: you do not have gettext installed on your
+system. The vlc build will work, but you will not have
+internationalization support. We suggest installing gettext.
+EOF
+  ;;
+  old) cat << EOF
 
-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
+==========================================================
+NOTE: you have an old version of gettext installed on your
+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
+  ;;
+esac
 
-##
-##  Update the potfiles because no one ever does it
-##
-if test "$do_po" = "no"
-then
-  echo "not updating potfiles. use --update-po to force doing it."
-else
-  cd po
-  make update-po 2>&1 | grep '^[^:]*:$' | cut -f1 -d: | tr '\n' ' ' | sed 's/ $//'
-  cd ..
-fi
+case "$PKGCONFIG" in
+  yes) ;;
+  no) cat << EOF
 
-##
-##  Tell the user about gettext and sed
-##
-case "$GETTEXT" in
-  yes)
-  ;;
-  no)
-    echo ""
-    echo "==========================================================="
-    echo "IMPORTANT NOTE: you do not have gettext installed on your"
-    echo "system. The vlc build will work, but you will not have"
-    echo "internationalization support. We suggest installing gettext."
-  ;;
-  old)
-    echo ""
-    echo "=========================================================="
-    echo "NOTE: you have an old version of gettext installed on your"
-    echo "system. We suggest upgrading to gettext 0.11.3 or later."
+==============================================================
+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
   ;;
 esac
 
-case "$SEDSUCKS" in
-  no)
+case "$AUTOMAKESUCKS" in
+  no) ;;
+  yes) 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
   ;;
-  yes)
-    echo ""
-    echo "============================================================="
-    echo "IMPORTANT NOTE: the version of 'sed' on your system is unable"
-    echo "to handle long lines. bootstrap will try its best to generate"
-    echo "a correct Makefile, but you should expect problems. We highly"
-    echo "recommend installing GNU sed."
+esac
+
+case "$INSTALLSUCKS" in
+  no) ;;
+  yes) 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
   ;;
 esac