[totem] Fix build on Cygwin

[Philip Withnall <pwithnall src gnome org>]

commit 485f7897b69c9b1180da338c9cecaf9efb9c7d63
Author: Yaakov Selkowitz <yselkowitz users sourceforge net>
Date:   Fri Dec 2 11:28:26 2011 +0000

    Fix build on Cygwin
    
    Ensure libraries are built with -no-undefined and fix dynamically loading
    dbus-glib in the browser plugin on Cygwin.
    
    Helps: bgo#572713

 browser-plugin/Makefile.am           |    1 +
 browser-plugin/totemPluginGlue.cpp   |    2 ++
 src/Makefile.am                      |    3 ++-
 src/plugins/Makefile.plugins         |    3 ++-
 src/plugins/zeitgeist-dp/Makefile.am |    5 ++++-
 5 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/browser-plugin/Makefile.am b/browser-plugin/Makefile.am
index 87cb60b..dffa4a8 100644
--- a/browser-plugin/Makefile.am
+++ b/browser-plugin/Makefile.am
@@ -49,6 +49,7 @@ plugin_ldflags = \
 	-avoid-version					\
 	-export-symbols $(srcdir)/plugin.symbols	\
 	-module						\
+	-no-undefined					\
 	$(AM_LDFLAGS)
 
 # Marshaller
diff --git a/browser-plugin/totemPluginGlue.cpp b/browser-plugin/totemPluginGlue.cpp
index abcc666..a905639 100644
--- a/browser-plugin/totemPluginGlue.cpp
+++ b/browser-plugin/totemPluginGlue.cpp
@@ -436,6 +436,8 @@ NP_Initialize (NPNetscapeFuncs *aMozillaVTable,
 	void *handle;
 #if defined(__OpenBSD__)
 	handle = dlopen ("libdbus-glib-1.so", RTLD_NOW | RTLD_NODELETE);
+#elif defined(__CYGWIN__)
+	handle = dlopen ("cygdbus-glib-1-2.dll", RTLD_NOW);
 #else
 	handle = dlopen ("libdbus-glib-1.so.2", RTLD_NOW | RTLD_NODELETE);
 #endif
diff --git a/src/Makefile.am b/src/Makefile.am
index e4edd6e..210b921 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -104,7 +104,8 @@ libtotem_la_CFLAGS = \
 	$(AM_CFLAGS)
 
 libtotem_la_LDFLAGS = \
-	-export_dynamic	\
+	-export-dynamic	\
+	-no-undefined \
 	$(AM_LDFLAGS)
 
 libtotem_la_LIBADD = \
diff --git a/src/plugins/Makefile.plugins b/src/plugins/Makefile.plugins
index c670c65..ae0357c 100644
--- a/src/plugins/Makefile.plugins
+++ b/src/plugins/Makefile.plugins
@@ -20,7 +20,8 @@ plugin_cflags = \
 	$(WARN_CFLAGS)
 
 plugin_ldflags = \
-	-export_dynamic \
+	-export-dynamic \
+	-no-undefined \
 	-avoid-version \
 	-module
 
diff --git a/src/plugins/zeitgeist-dp/Makefile.am b/src/plugins/zeitgeist-dp/Makefile.am
index 7472b12..3f544f5 100644
--- a/src/plugins/zeitgeist-dp/Makefile.am
+++ b/src/plugins/zeitgeist-dp/Makefile.am
@@ -14,7 +14,10 @@ VALAFLAGS = \
 	bacon-video.vapi
 
 libtotem_zeitgeist_dp_plugin_la_SOURCES = totem-zeitgeist-dp-plugin.vala
-libtotem_zeitgeist_dp_plugin_la_LDFLAGS = $(plugin_ldflags) $(LIBZEITGEIST_LIBS)
+libtotem_zeitgeist_dp_plugin_la_LDFLAGS = $(plugin_ldflags)
+libtotem_zeitgeist_dp_plugin_la_LIBADD = \
+	$(plugin_libadd)		\
+	$(LIBZEITGEIST_LIBS)
 libtotem_zeitgeist_dp_plugin_la_CFLAGS = \
 	$(plugin_cflags) \
 	$(LIBZEITGEIST_CFLAGS) \