- Improve DIST_SUBDIR

[vlc] / bootstrap

diff --git a/bootstrap b/bootstrap
index b29bbc40373e7110f2e26e7beaea3f3ddd72db21..915dc63f7c45fc3050b4aef81328262c2f38ea8e 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"


@@ -35,8 +35,10 @@ ACLOCAL_ARGS="-I m4"
 
 # 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


@@ -46,57 +48,54 @@ if test -d extras/contrib/bin; then
   fi
 fi
 
   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
 # 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
+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.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
+done
+
+if test "${amvers}" = "no" && automake --version > /dev/null 2>&1; then
+  amvers="`automake --version | sed -e '1s/[^0-9]*//' -e q`"
+  amsuff=""

 fi
 
 fi
 

-if test "${amvers}" = "none"; then
+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
   set +x

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

   exit 1
 fi
 
   exit 1
 fi
 


@@ -113,9 +112,9 @@ else
   autopoint=:
   GETTEXT=old
 fi;else
   autopoint=:
   GETTEXT=old
 fi;else

-  # we don't have gettext. grmbl. try to continue anyway.
-  autopoint=:
-  GETTEXT=no
+  set +x
+  echo "you need gettextize (package gettext-devel or gettext)"
+  exit 1

 fi
 
 # Check for pkg-config
 fi
 
 # Check for pkg-config


@@ -126,8 +125,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
 


@@ -145,8 +144,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


@@ -196,10 +195,11 @@ do
   subdirs="`sed -ne 's,'modules/${dir}'/\([^/]*\)/Makefile,\1,p' configure.ac | xargs`"
   mods="`sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < "${modf}" | xargs`"
   extra_libs=""
   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_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
 
   done
   rm -f "${makf}" && cat > "${makf}" << EOF
 


@@ -210,44 +210,52 @@ basedir = ${basedir}
 mods = ${mods}
 
 NULL =
 mods = ${mods}
 
 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}
 SUFFIXES = _plugin\$(LIBEXT) _plugin.a
 
 libvlcdir = \$(libdir)/vlc/\$(basedir)
 
 EXTRA_LIBRARIES = ${extra_libs}
 SUBDIRS = ${subdirs}
 SUFFIXES = _plugin\$(LIBEXT) _plugin.a
 
 libvlcdir = \$(libdir)/vlc/\$(basedir)
 
 EXTRA_LIBRARIES = ${extra_libs}

+EXTRA_LTLIBRARIES = ${extra_ltlibs}
+

 include Modules.am
 
 include Modules.am
 

-if !BUILD_MOZILLA
-pic = no
-else
+LTLIBVLC = \$(top_builddir)/src/libvlc.la
+

 if HAVE_WIN32
 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
+LIBVLC = -L\$(top_builddir)/src -lvlc
+LIBADD = \$(LIBVLC)

 endif
 
 all: all-modules
 
 endif
 
 all: all-modules
 

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

 # Find out which modules were enabled and tell make to build them
 all-modules:
 # 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=\`\\
        @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)" != "no"; 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\$(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"
        \`; 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):
 
 # 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 vlc_entry__0_8_2" ; \
+       @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)" ;; \
        case \`\$(VLC_CONFIG) --linkage \$\$mod\` in \\
          c++)  ld="\$(CXXLINK)" ;; \
          objc) ld="\$(OBJCLINK)" ;; \


@@ -255,48 +263,57 @@ _plugin.a_plugin\$(LIBEXT):
        esac ; \
        echo \$\$ld \$< \$\$ldfl ; \
        \$\$ld \$< \$\$ldfl
        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
 \$(srcdir)/Makefile.am: \$(srcdir)/Modules.am \$(top_srcdir)/bootstrap
        cd \$(top_srcdir) && \$(SHELL) ./bootstrap

+endif

 
 mostlyclean-local:
 
 mostlyclean-local:

+if USE_LIBTOOL
+       -rm -f *.la
+else

        -rm -f *.a *\$(LIBEXT)
        -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
 
 ### automake creates libvlcdir after running install-*-local
 ### so we have to create it ourselves first
 install-exec-local: all-modules

-       \$(mkdir_p) "\$(DESTDIR)\$(libvlcdir)"
+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}\ *) \
        @z=\$\$(\$(VLC_CONFIG) --list plugin); \
        for mod in \$(mods); do \
          case "\$\$z " \
            in *\ \$\${mod}\ *) \

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

              ;; \
          esac; \
        done
 endif
 
 uninstall-local:
              ;; \
          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 " \
        @z=\$\$(\$(VLC_CONFIG) --list plugin); \
        for mod in \$(mods); do \
          case "\$\$z " \


@@ -306,25 +323,6 @@ uninstall-local:
              ;; \
          esac; \
        done
              ;; \
          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
 
 EOF
 endif
 
 EOF


@@ -348,7 +346,7 @@ EOF
 
 EOF
     if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
 
 EOF
     if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF

-clean-local: clean-${mod}
+clean_modules += clean-${mod}

 clean-${mod}:
        -test -z "\$(nodist_SOURCES_${mod})" || rm -f \$(nodist_SOURCES_${mod})
 
 clean-${mod}:
        -test -z "\$(nodist_SOURCES_${mod})" || rm -f \$(nodist_SOURCES_${mod})
 


@@ -360,37 +358,35 @@ EOF
     fi
     cat >> "${makf}" << EOF
 lib${mod}_plugin_a_SOURCES = \$(SOURCES_${mod})
     fi
     cat >> "${makf}" << EOF
 lib${mod}_plugin_a_SOURCES = \$(SOURCES_${mod})

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

 EOF
     if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
 nodist_lib${mod}_plugin_a_SOURCES = \$(nodist_SOURCES_${mod})
 EOF
     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
     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}\`
 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})
+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
     if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
 EOF
     if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF

-nodist_lib${mod}_pic_a_SOURCES = \$(nodist_SOURCES_${mod})
+nodist_lib${mod}_a_SOURCES = \$(nodist_SOURCES_${mod})

 EOF
     fi
     cat >> "${makf}" << EOF
 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})
-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}_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
 
 EOF
   done


@@ -423,7 +419,7 @@ set -x
 
 # remove autotools cruft
 rm -f aclocal.m4 configure config.log config.h config.h.in
 
 # remove autotools cruft
 rm -f aclocal.m4 configure config.log config.h config.h.in

-rm -Rf autom4te.cache
+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


@@ -434,9 +430,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


@@ -447,19 +441,42 @@ 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
+
+# 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
+

 # Do the rest
 ${autopoint} -f
 ${aclocal} ${ACLOCAL_ARGS}
 ${autoconf}
 ${autoheader}
 # Do the rest
 ${autopoint} -f
 ${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


@@ -467,17 +484,8 @@ set +x
 ##
 ##  Tell the user about gettext, pkg-config and sed
 ##
 ##
 ##  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


@@ -485,44 +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