- Improve DIST_SUBDIR

[vlc] / bootstrap

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

-##  $Id: bootstrap,v 1.64 2003/07/04 14:56:51 sam Exp $
+##
+## Copyright (C) 2005-2006 the VideoLAN team

 ##
 ##  Authors: 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"


@@ -20,98 +22,315 @@ export LANG
 CYGWIN=binmode
 export CYGWIN
 
 CYGWIN=binmode
 export CYGWIN
 

+set -e
+set -x
+

 ##
 ##

-## Naively assume our system doesn't suck. Unfortunately it seldom doesn't.
+## Check for various tools

 ##
 AUTOMAKESUCKS=no
 INSTALLSUCKS=no
 
 ##
 AUTOMAKESUCKS=no
 INSTALLSUCKS=no
 

-##
-## Check that our tools don't suck
-##
+ACLOCAL_ARGS="-I m4"
+
+# Check for contrib directory
+if test -d extras/contrib/bin; then
+  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
+  elif test ".`uname -s`" = ".BeOS"; then
+    export LIBRARY_PATH=./extras/contrib/lib:$LIBRARY_PATH
+    export BELIBRARIES=./extras/contrib/lib:$BELIBRARIES
+  fi
+fi
+
+# Check for autoconf
+rm -f m4/autoconf260.m4
+case "$(autoconf --version|head -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
+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
+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 glibtoolize --version >/dev/null 2>&1; then
+  libtoolize="glibtoolize"
+elif libtoolize --version >/dev/null 2>&1; then
+  libtoolize="libtoolize"
+fi
+
+if test "$libtoolize" = "no"; then
+  set +x
+  echo "$0: you need libtool"
+  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
+  set +x
+  echo "you need gettextize (package gettext-devel or gettext)"
+  exit 1
+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${amsuff}
+automake=automake${amsuff}
+autoconf=autoconf
+autoheader=autoheader

 
 ##
 ## Generate the modules makefile, by parsing modules/**/Modules.am
 ##
 
 
 ##
 ## Generate the modules makefile, by parsing modules/**/Modules.am
 ##
 

-printf "generating modules/**/Makefile.am and m4/private.m4"
+set +x
+echo "generating modules/**/Makefile.am and m4/private.m4"

 
 # Prepare m4/private.m4
 rm -f m4/private.m4 && cat > m4/private.m4 << EOF
 dnl  Private VLC macros - generated by bootstrap
 
 EOF
 
 # Prepare m4/private.m4
 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 assume package was not found
+AC_DEFUN([PKG_CHECK_MODULES],[ifelse([\$4], , :, [\$4])])
+
+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
 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], [
+AC_DEFUN([VLC_CONDITIONALS], [

 EOF
 rm -f m4/private.m4-tmp2 && cat > m4/private.m4-tmp2 << EOF
 dnl  The required AC_SUBST calls
 EOF
 rm -f m4/private.m4-tmp2 && cat > m4/private.m4-tmp2 << EOF
 dnl  The required AC_SUBST calls

-AC_DEFUN([AX_VLC_SUBSTS], [
+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
 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([
+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
 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], [
+AC_DEFUN([VLC_CONFIG_HELPER], [

   cat >> vlc-config.in << BLAH
 EOF
 
 modules=""
   cat >> vlc-config.in << BLAH
 EOF
 
 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`
 
 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 "."
 EOF
 
 for dir in `sed -ne 's,modules/\(.*\)/Makefile,\1,p' configure.ac`
 do
   printf "."

-  mf="modules/${dir}/Modules.am"
-  basedir="`echo ${dir} | cut -f1 -d/`"
+  modf="modules/${dir}/Modules.am"
+  makf="modules/${dir}/Makefile.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`"
   # 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
+  mods="`sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < "${modf}" | xargs`"
+  extra_libs=""
+  extra_ltlibs=""
+  for mod in $mods
+  do
+    extra_libs="${extra_libs} lib${mod}_plugin.a lib${mod}.a"
+    extra_ltlibs="${extra_ltlibs} lib${mod}_plugin.la"
+  done
+  rm -f "${makf}" && cat > "${makf}" << EOF

 
 

-# Autogenerated by bootstrap - DO NOT EDIT - edit Modules.am instead
+# ${makf} automatically generated from ${modf} by bootstrap
+# DO NOT EDIT - edit Modules.am or \$(top_srcdir)/bootstrap instead
+
+basedir = ${basedir}
+mods = ${mods}

 
 NULL =
 
 NULL =

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

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

+clean_modules =

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

-#DIST_SUBDIRS = \$(SUBDIRS)
-libvlcdir = \$(libdir)/vlc/${basedir}
+SUFFIXES = _plugin\$(LIBEXT) _plugin.a
+
+libvlcdir = \$(libdir)/vlc/\$(basedir)
+
+EXTRA_LIBRARIES = ${extra_libs}
+EXTRA_LTLIBRARIES = ${extra_ltlibs}
+

 include Modules.am
 
 include Modules.am
 

-clean:
-       rm -f *.a *.so *.dll *.sl *.dylib
+LTLIBVLC = \$(top_builddir)/src/libvlc.la
+
+if HAVE_WIN32
+LIBVLC = -L\$(top_builddir)/src -lvlc
+LIBADD = \$(LIBVLC)
+endif
+
+all: all-modules
+
+nice:
+       \$(top_builddir)/compile
+
+# Find out which modules were enabled and tell make to build them
+all-modules:
+if USE_LIBTOOL
+       @set fnord \$\$MAKEFLAGS; amf=\$\$2; targets=\`\\
+       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=\`\\
+       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
+
+# Build a plugin with the adequate linker and linker's flags
+_plugin.a_plugin\$(LIBEXT):
+       @mod="\$*" ; mod=\$\${mod#lib} ; \
+       ldfl="\`\$(VLC_CONFIG) --libs plugin \$\$mod\` \$(LIBADD) -u \$(SYMPREF)\$(VLC_ENTRY)" ; \
+       case \`\$(VLC_CONFIG) --linkage \$\$mod\` in \\
+         c++)  ld="\$(CXXLINK)" ;; \
+         objc) ld="\$(OBJCLINK)" ;; \
+         c|*)  ld="\$(LINK)" ;; \
+       esac ; \
+       echo \$\$ld \$< \$\$ldfl ; \
+       \$\$ld \$< \$\$ldfl
+#ifneq (,\$(findstring cygwin,\$(host)))
+#      mv -f "\$@.exe" "\$@"
+#endif
+       @if test -f "\$@.exe"; then mv -f "\$@.exe" "\$@"; fi
+
+if MAINTAINER_MODE
+\$(srcdir)/Makefile.am: \$(srcdir)/Modules.am \$(top_srcdir)/bootstrap
+       cd \$(top_srcdir) && \$(SHELL) ./bootstrap
+endif
+
+mostlyclean-local:
+if USE_LIBTOOL
+       -rm -f *.la
+else
+       -rm -f *.a *\$(LIBEXT)
+endif
+
+clean-local: \$(clean_modules)
+
+### automake creates libvlcdir after running install-*-local
+### so we have to create it ourselves first
+install-exec-local: all-modules
+if USE_LIBTOOL
+       @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
+else
+       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
+endif
+
+uninstall-local:
+if USE_LIBTOOL
+       @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
+else
+       @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
+endif

 
 EOF
 
 EOF

-  for mod in `sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < ${mf}`
+  for mod in $mods

   do
   do

-    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
+    if grep '^nodist_SOURCES_'${mod}'' < "${modf}" >/dev/null 2>&1; then

         NODIST=''; else
         NODIST='#'; fi
         NODIST=''; else
         NODIST='#'; fi

-#    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
     cat >> m4/private.m4-tmp4 << EOF
     ${mod}) list="\\\${list} ${dir}/lib${mod}" ;;
 EOF


@@ -122,111 +341,58 @@ EOF
 #   the resulting file size.
 # - *_CFLAGS, *_CXXFLAGS etc. because per-object CPPFLAGS does not seem to
 #   work properly with any automake version I tested.
 #   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
+    cat >> "${makf}" << EOF

 # The ${mod} plugin
 
 # The ${mod} plugin
 

-all: all-${mod}
-
-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${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
 EOF

-    if [ "${NODIST}" != "#" ]; then cat >> modules/${dir}/Makefile.am << EOF
-B${count} = \$(nodist_SOURCES_${mod})
-EOF
-    fi
-    cat >> modules/${dir}/Makefile.am << EOF
-endif
+    if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
+clean_modules += clean-${mod}
+clean-${mod}:
+       -test -z "\$(nodist_SOURCES_${mod})" || rm -f \$(nodist_SOURCES_${mod})

 
 EOF
 
 EOF

-    if [ "${NODIST}" != "#" ]; then cat >> modules/${dir}/Makefile.am << EOF
-${PRIVATE}BUILT_SOURCES += \$(B${count})
+    fi
+    if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
+BUILT_SOURCES += \$(B${mod})

 EOF
     fi
 EOF
     fi

-    cat >> modules/${dir}/Makefile.am << EOF
-${PRIVATE}lib${mod}_plugin_a_SOURCES = \$(SOURCES_${mod})
+    cat >> "${makf}" << EOF
+lib${mod}_plugin_a_SOURCES = \$(SOURCES_${mod})
+lib${mod}_plugin_la_SOURCES = \$(SOURCES_${mod})

 EOF
 EOF

-    if [ "${NODIST}" != "#" ]; then cat >> modules/${dir}/Makefile.am << EOF
-${PRIVATE}nodist_lib${mod}_plugin_a_SOURCES = \$(nodist_SOURCES_${mod})
+    if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
+nodist_lib${mod}_plugin_a_SOURCES = \$(nodist_SOURCES_${mod})
+nodist_lib${mod}_plugin_la_SOURCES = \$(nodist_SOURCES_${mod})

 EOF
     fi
 EOF
     fi

-    cat >> modules/${dir}/Makefile.am << EOF
+    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}_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})
+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}\` \\
+       -rpath '\$(libvlcdir)' -avoid-version -module -shrext \$(LIBEXT) \\
+       -export-symbol-regex ^\$(VLC_ENTRY)\$\$ -no-undefined
+lib${mod}_plugin_la_LIBADD = \$(LTLIBVLC)
+
+lib${mod}_a_SOURCES = \$(SOURCES_${mod})

 EOF
 EOF

-    if [ "${NODIST}" != "#" ]; then cat >> modules/${dir}/Makefile.am << EOF
-nodist_lib${mod}_pic_a_SOURCES = ${PRIVATE}\$(nodist_SOURCES_${mod})
+    if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
+nodist_lib${mod}_a_SOURCES = \$(nodist_SOURCES_${mod})

 EOF
     fi
 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${count}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
-
+    cat >> "${makf}" << EOF
+lib${mod}_a_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin pic ${mod}\`
+lib${mod}_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin pic ${mod}\`
+lib${mod}_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin pic ${mod}\`

 
 EOF
   done
 done
 
 cat >> m4/private.m4-tmp1 << EOF
 
 EOF
   done
 done
 
 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
 ])
 EOF
 cat m4/private.m4-tmp1 >> m4/private.m4 && rm -f m4/private.m4-tmp1


@@ -244,7 +410,7 @@ BLAH
 EOF
 cat m4/private.m4-tmp4 >> m4/private.m4 && rm -f m4/private.m4-tmp4
 
 EOF
 cat m4/private.m4-tmp4 >> m4/private.m4 && rm -f m4/private.m4-tmp4
 

-echo "done."
+echo " done."

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


@@ -252,140 +418,74 @@ echo "done."
 set -x
 
 # remove autotools cruft
 set -x
 
 # remove autotools cruft

-rm -f aclocal.m4 configure configure.ac.in config.log Modules.am
+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
 # 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)
+rm -Rf autotools
+mkdir autotools

 # remove libtool cruft
 rm -f ltmain.sh libtool ltconfig
 # remove gettext cruft
 # remove libtool cruft
 rm -f ltmain.sh libtool ltconfig
 # remove gettext cruft

-rm -f m4/oldgettext.m4 ABOUT-NLS
+rm -f ABOUT-NLS

 rm -Rf intl
 rm -Rf intl

+# remove vlc cruft
+rm -f stamp-builtin stamp-h* mozilla/stamp-pic

 
 

-# 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 || 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
-  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
-  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
+# 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
 
 fi
 

-# Check for automake
-amvers="none"
-if automake-1.7 --version >/dev/null 2>&1; then
-  amvers="-1.7"
-  # 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
+# Libtoolize directory
+${libtoolize} --copy --force
+if test -f "ltmain.sh"; then
+  echo "$0: working around a minor libtool issue"
+  mv ltmain.sh autotools/

 fi
 
 fi
 

-if test "${amvers}" = "none"; then
-  set +x
-  echo "you need automake version 1.5 or later"
-  exit 1
+# patch for DLL link for libtool on cygwin (remove when fixed)
+if test ".`uname -s|sed -n '/^CYGWIN/p'`" != "."; then
+patch -s -p0 << 'EOF'
+--- autotools/ltmain.orig      2006-12-05 15:15:42.064607000 +0000
++++ autotools/ltmain.sh        2006-12-05 15:16:24.705777800 +0000
+@@ -4360,7 +4360,7 @@
+ 
+     prog)
+       case $host in
+-      *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
++      *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,;s,.dll.exe$,.dll,'` ;;
+       esac
+       if test -n "$vinfo"; then
+       $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
+EOF

 fi
 
 fi
 

-# Automake complains if this is not present
-rm -f vlc-config.in && printf "" > vlc-config.in
-

 # Do the rest
 # Do the rest

-aclocal${amvers} -I m4 || exit 1
-autoheader || exit 1
-
-automake${amvers} --add-missing --copy
-
-autoconf || exit 1
+${autopoint} -f
+${aclocal} ${ACLOCAL_ARGS}
+${autoconf}
+${autoheader}
+${automake} --add-missing --copy -Wall

 
 ##
 ##  files which need to be regenerated
 ##
 rm -f vlc-config.in vlc-config
 
 ##
 ##  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
+rm -f src/misc/modules_builtin.h

 
 

-##
-##  Shut up
-##
+# Shut up

 set +x
 
 ##
 ##  Tell the user about gettext, pkg-config and sed
 ##
 set +x
 
 ##
 ##  Tell the user about gettext, pkg-config and sed
 ##

-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
+if [ "${GETTEXT}" = "old" ]; then
+  cat << EOF

 
 ==========================================================
 NOTE: you have an old version of gettext installed on your
 
 ==========================================================
 NOTE: you have an old version of gettext installed on your


@@ -393,50 +493,15 @@ 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

-  ;;
-esac
+fi

 
 

-case "$PKGCONFIG" in
-  yes)
-  ;;
-  no)
-    cat << EOF
+if [ "$PKGCONFIG" = "no" ]; then
+  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
 
 ==============================================================
 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 "$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
-  ;;
-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
+fi