bootstrap: remove libtool patch for cygwin as we now use libtool 'properly'

[vlc] / bootstrap

diff --git a/bootstrap b/bootstrap
index 3e0c9b578a9695cc0e37d9964a7ce1ae0db68c84..d019670af1fc7030c589624907b6c9b1bb53c145 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -221,18 +221,16 @@ EXTRA_LTLIBRARIES = ${extra_ltlibs}
 
 include Modules.am
 
-LTLIBVLC = \$(top_builddir)/src/libvlc.la
+LTLIBVLC = -L\$(top_builddir)/src -lvlc
 
 AM_LDFLAGS = -rpath '\$(libvlcdir)' -avoid-version \\
-       -module -no-undefined -shrext \$(LIBEXT) \\
-       -export-symbol-regex ^\$(VLC_ENTRY)\$\$
-
-if USE_LIBTOOL
-AM_LIBADD = \$(LTLIBVLC)
-endif
-if HAVE_WIN32
-LIBVLC = \$(top_builddir)/src/libvlc.dll
+       -module -no-undefined -shrext \$(LIBEXT) 
+if HAVE_COMPILER_EXPORT
+AM_LDFLAGS += -export-dynamic
+else
+AM_LDFLAGS += -export-symbol-regex ^\$(VLC_ENTRY)\$\$
 endif
+AM_LIBADD = \$(LTLIBVLC)
 
 all: all-modules
 
@@ -241,18 +239,10 @@ nice:
 
 # 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.la_plugin\$(LIBEXT):
@@ -273,53 +263,25 @@ if MAINTAINER_MODE
 endif
 
 mostlyclean-local:
-       -rm -f *.la
-if !USE_LIBTOOL
-       -rm -f *\$(LIBEXT)
-endif
+       -rm -f -- *.la
 
 ### 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
   for mod in $mods
@@ -360,6 +322,8 @@ EOF
   done
 done
 
+printf "\n"
+
 cat >> m4/private.m4 << EOF
 BLAH
 ])
@@ -401,25 +365,9 @@ if test -f "ltmain.sh"; then
   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
+rm -f po/Makevars.template
 ${aclocal} ${ACLOCAL_ARGS}
 ${autoconf}
 ${autoheader}