X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=de22f0cfa294d38f04500e641109db39277bad21;hb=416de47b7f3632a02ed35e4aa1ae0daf8aaf7aec;hp=bcbea63ab4b2a21da41a557a053d6e99161acbb7;hpb=eb28b62d8b2f280ba1610d77e459c51fd7bdf34d;p=vlc

diff --git a/bootstrap b/bootstrap
index bcbea63ab4..de22f0cfa2 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,14 +1,14 @@
 #! /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.61 2003/07/02 14:08:56 sam Exp $
 ##
-##  Authors: Samuel Hocevar <sam@zoy.org>
+##  Authors: Sam Hocevar <sam@zoy.org>
 
-if test x$# != x0; then
-  echo "Usage: ./bootstrap"
-  echo "  Calls automake, autoconf, autoheader, autopoint and other auto* to build"
-  echo "  Makefiles."
+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
 
@@ -23,147 +23,208 @@ export CYGWIN
 ##
 ## Naively assume our system doesn't suck. Unfortunately it seldom doesn't.
 ##
-SEDSUCKS=no
-PERLSUCKS=no
 AUTOMAKESUCKS=no
 INSTALLSUCKS=no
 
 ##
 ## Check that our tools don't suck
 ##
-if test ! 20000 -eq `perl -e 'printf "%s\n","a"x20000' | sed -e 's/.//' 2>/dev/null | wc -c`
-then
-  SEDSUCKS=yes
-fi
-
-# Mac OS X stacksize sucks
-if test x`uname -s` = xDarwin; then ulimit -s 20000; fi
 
 ##
 ## Generate the modules makefile, by parsing modules/**/Modules.am
 ##
 
-printf "generating Modules.am and configure.ac"
+printf "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
+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([AX_VLC_CONDITIONALS], [
+EOF
+rm -f m4/private.m4-tmp2 && cat > m4/private.m4-tmp2 << EOF
+dnl  The required AC_SUBST calls
+AC_DEFUN([AX_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([AX_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([AX_VLC_CONFIG_HELPER], [
+  cat >> vlc-config.in << BLAH
+EOF
 
-cat >> configure.ac << EOF
-dnl ################################################################
-dnl # Do not edit this file, it was generated from configure.ac.in #
-dnl ################################################################
+modules=""
+count=0
 
+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
-sed -n -e '/dnl do not touch this line/q;p' < configure.ac.in >> configure.ac
 
-modules=""
-for mf in `sed -ne 's@[^a-z]*\([^ ]*\)am.*@modules/\1am@p' < modules/Makefile.am`
+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}
-
-include ${dir}/Modules.am
+  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`"
+  #parent=`echo ${dir} | sed -e 's@[^/]*@..@g'`
+  #echo "  modules/${dir}/Makefile" >> m4/private.m4-tmp3
+  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
+
+clean:
+	rm -f *.a *.so *.dll *.sl *.dylib
 
 EOF
-  sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < ${mf} | while read mod
+  for mod in `sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < ${mf}`
   do
-    LINKER="LINK"
-    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
-        LINKER="CXXLINK"
-        echo "AC_SUBST(CXXFLAGS_${mod})" >> configure.ac; fi
-    if echo "$ALL_FLAGS" | grep '^OBJCFLAGS_'${mod}'=$' >/dev/null 2>&1; then
-        LINKER="OBJCLINK"
-        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
+    count="`expr ${count} + 1`"
     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
-# Generation of Modules.am
-# ~~~~~~~~~~~~~~~~~~~~~~~~
+# 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. include *_CPPFLAGS because per-object CPPFLAGS
-#   does not seem to work properly with any automake version I tested.
-    cat >> Modules.am << EOF
+# - *_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
-if UNTRUE
-L_${mod}_p = ${dir}/lib${mod}_plugin.a
-endif
-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})
+all: all-${mod}
+
+all-${mod}:
 if BUILD_MOZILLA
-L_${mod}_pic = ${dir}/lib${mod}_pic.a
+	if \$(VLC_CONFIG) --target plugin | grep "${dir}/lib${mod}_plugin" >/dev/null 2>&1 ; then \$(MAKE) \$(AM_MAKEFLAGS) lib${mod}_plugin\$(LIBEXT); fi; \\
+	if \$(VLC_CONFIG) --target builtin | grep "${dir}/lib${mod}\\.a" >/dev/null 2>&1 ; then \$(MAKE) \$(AM_MAKEFLAGS) lib${mod}.a; fi; \\
+	if \$(VLC_CONFIG) --target builtin pic | grep "${dir}/lib${mod}_pic\\.a" >/dev/null 2>&1 ; then \$(MAKE) \$(AM_MAKEFLAGS) lib${mod}_pic.a; fi
+else
+	if \$(VLC_CONFIG) --target plugin | grep "${dir}/lib${mod}_plugin" >/dev/null 2>&1 ; then \$(MAKE) \$(AM_MAKEFLAGS) lib${mod}_plugin\$(LIBEXT); fi; \\
+	if \$(VLC_CONFIG) --target builtin | grep "${dir}/lib${mod}\\.a" >/dev/null 2>&1 ; then \$(MAKE) \$(AM_MAKEFLAGS) lib${mod}.a; fi
 endif
-${NODIST}B_${mod}_b = \$(nodist_SOURCES_${mod})
+
+if UNTRUE
+L${count}p = lib${mod}_plugin.a
+D${count}p = lib${mod}_plugin\$(LIBEXT)
+L${count}b = lib${mod}.a
+L${count}pic = lib${mod}_pic.a
+EOF
+    if [ "${NODIST}" != "#" ]; then cat >> modules/${dir}/Makefile.am << EOF
+B${count}p = \$(nodist_SOURCES_${mod})
+B${count}b = \$(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)
-PLUGIN_FILES += \$(D_${mod}_p)
-
-${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${count}p) \$(B${count}b)
+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${count}b) \$(L${count}pic)
+lib${mod}_DATA = \$(D${count}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}noinst_LIBRARIES += \$(L${count}p)
+${PRIVATE}lib${mod}_plugin\$(LIBEXT): \$(lib${mod}_plugin_a_OBJECTS)
+${PRIVATE}	case \`\$(VLC_CONFIG) --linkage ${mod}\` in \\
+${PRIVATE}	  c++) \$(CXXLINK) \$(lib${mod}_plugin_a_OBJECTS) \`\$(VLC_CONFIG) --libs plugin ${mod}\` ;; \\
+${PRIVATE}	  objc) \$(OBJCLINK) \$(lib${mod}_plugin_a_OBJECTS) \`\$(VLC_CONFIG) --libs plugin ${mod}\` ;; \\
+${PRIVATE}	  c|*) \$(LINK) \$(lib${mod}_plugin_a_OBJECTS) \`\$(VLC_CONFIG) --libs plugin ${mod}\` ;; \\
+${PRIVATE}	esac
 
 
 EOF
   done
 done
 
-echo "AM_CONDITIONAL(UNTRUE, false)" >> configure.ac
-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."
 
@@ -171,109 +232,116 @@ 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
+
+# remove autotools cruft
+rm -f aclocal.m4 configure configure.ac.in config.log Modules.am
+# remove old autotools extra cruft
+rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh
+# remove new autotools extra cruft
+(cd autotools && rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh)
+# remove libtool cruft
+rm -f ltmain.sh libtool ltconfig
+# remove gettext cruft
+rm -f m4/oldgettext.m4 ABOUT-NLS
 rm -Rf intl
 
 # Check for gettext
-if gettextize --version >/dev/null 2>&1
-then
+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.2 >/dev/null 2>&1
-then
+        '>=' 0.11.5 >/dev/null 2>&1; then
   # We have gettext, and a recent version! Everything is cool.
   autopoint || exit 1
   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
+  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
   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
+  cat >> m4/private.m4 << EOF
+dnl  User does not have gettext, so this is a no-op
+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
+
+EOF
   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
+  # 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
+
 # Check for automake
 amvers="none"
-if automake-1.7 --version >/dev/null 2>&1
-then
+if automake-1.7 --version >/dev/null 2>&1; then
   amvers="-1.7"
-else
-  if 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
-  else
-    if automake-1.5 --version >/dev/null 2>&1
-    then
-      INSTALLSUCKS=yes
-      amvers="-1.5"
-    else
-      if automake --version > /dev/null 2>&1
-      then
-        amvers=`automake --version | sed -e '1s/[^0-9]*//' -e q`
-        case $amvers in
-        1.6|1.6.0|1.6.1)
-          AUTOMAKESUCKS=yes ;;
-        1.5|1.5.*)
-          INSTALLSUCKS=yes ;;
-        esac
-
-        if expr "$amvers" "<" "1.5" > /dev/null 2>&1
-        then amvers="none"
-        else amvers=""
-        fi
-      fi
+  # If we also have 1.6, 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 ;;
+  esac
 fi
 
-if test x$amvers = xnone
-then
+if test "${amvers}" = "none"; then
   set +x
   echo "you need automake version 1.5 or later"
   exit 1
 fi
 
+# Automake complains if this is not present
+rm -f vlc-config.in && printf "" > vlc-config.in
+
 # 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
-    cat << EOF
-
-=======================================================================
-IMPORTANT NOTE: automake failed, please check the error messages. If it
-actually segfaulted, it might be because of insufficient stack size; set
-the stack size to something bigger or unlimited (\`unlimit stacksize')
-and try again.
-EOF
-    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
+automake${amvers} --add-missing --copy
 
 autoconf || exit 1
 
 ##
-##  headers which need to be regenerated
+##  files which need to be regenerated
 ##
+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
@@ -284,42 +352,9 @@ 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
+##  Tell the user about gettext, pkg-config and sed
 ##
-case "$GETTEXT" in
+case "${GETTEXT}" in
   yes)
   ;;
   no)
@@ -338,7 +373,21 @@ EOF
 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.3 or later.
+We suggest upgrading to gettext 0.11.5 or later.
+EOF
+  ;;
+esac
+
+case "$PKGCONFIG" in
+  yes)
+  ;;
+  no)
+    cat << EOF
+
+==============================================================
+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
@@ -373,18 +422,3 @@ EOF
   ;;
 esac
 
-case "$SEDSUCKS" in
-  no)
-  ;;
-  yes)
-    cat << EOF
-
-=============================================================
-IMPORTANT NOTE: the version of 'sed' on your system is unable
-to handle long lines. bootstrap will try its best to generate
-a correct Makefile, but you should expect problems. We highly
-recommend installing GNU sed.
-EOF
-  ;;
-esac
-