X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=a19662e631ac38eb08d351180aeca78ea71b4117;hb=649ddb6f6488e80fd2a14f5c0899474679a00af7;hp=01d0d11fe63fcf7aeac4b81ab536d05ecb08398f;hpb=f243dbe49c1f27ba4fd604a13ac2eba45fdc8e95;p=vlc

diff --git a/bootstrap b/bootstrap
index 01d0d11fe6..a19662e631 100755
--- a/bootstrap
+++ b/bootstrap
@@ -221,12 +221,18 @@ EXTRA_LTLIBRARIES = ${extra_ltlibs}
 
 include Modules.am
 
+if HAVE_PLUGINS
 LTLIBVLC = -L\$(top_builddir)/src -lvlc
 
 AM_LDFLAGS = -rpath '\$(libvlcdir)' -avoid-version \\
-	-module -no-undefined -shrext \$(LIBEXT) \\
-	-export-symbol-regex ^\$(VLC_ENTRY)\$\$
+	-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)
+endif
 
 all: all-modules
 
@@ -251,7 +257,6 @@ _plugin.la_plugin\$(LIBEXT):
 	esac ; \
 	echo \$\$ld \$< \$\$ldfl ; \
 	\$\$ld \$< \$\$ldfl
-	@if test -f "\$@.exe"; then mv -f -- "\$@.exe" "\$@"; fi
 
 if MAINTAINER_MODE
 \$(srcdir)/Makefile.am: \$(srcdir)/Modules.am \$(top_srcdir)/bootstrap
@@ -304,7 +309,7 @@ lib${mod}_plugin_la_SOURCES = \$(SOURCES_${mod})
 EOF
     if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
 nodist_lib${mod}_plugin_la_SOURCES = \$(nodist_SOURCES_${mod})
-CLEANFILES += "\$(nodist_SOURCES_${mod})"
+CLEANFILES += \$(nodist_SOURCES_${mod})
 BUILT_SOURCES += \$(B${mod})
 EOF
     fi
@@ -361,23 +366,6 @@ 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