diff -Nurp dia-0.93/lib/Makefile.in dia-0.93-cygwin/lib/Makefile.in
--- dia-0.93/lib/Makefile.in	2004-04-30 01:14:44.000000000 +0800
+++ dia-0.93-cygwin/lib/Makefile.in	2004-05-20 18:03:32.000000000 +0800
@@ -367,7 +367,7 @@ libdia_la_SOURCES = \
 #		charconv.h 
 #		render.h \
 #		render.c 
-libdia_la_LDFLAGS = -export-dynamic -module -avoid-version
+libdia_la_LDFLAGS = -export-dynamic -avoid-version -no-undefined
 
 AM_CPPFLAGS = \
 	$(LIBART_CFLAGS) \
@@ -394,7 +394,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 
-libdia_la_LIBADD =
+libdia_la_LIBADD = $(GTK_LIBS)
 am__objects_1 = properties.lo propdesc.lo proplist.lo propoffsets.lo \
 	propobject.lo prop_basic.lo prop_inttypes.lo prop_geomtypes.lo \
 	prop_attr.lo prop_text.lo prop_widgets.lo prop_sdarray.lo \
@@ -499,8 +499,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLI
 	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(pkglibdir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(pkglibdir)/$$f; \
+	    echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
+	    $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
 	  else :; fi; \
 	done
 
@@ -521,7 +521,7 @@ clean-pkglibLTLIBRARIES:
 	  rm -f "$${dir}/so_locations"; \
 	done
 libdia.la: $(libdia_la_OBJECTS) $(libdia_la_DEPENDENCIES) 
-	$(LINK) -rpath $(pkglibdir) $(libdia_la_LDFLAGS) $(libdia_la_OBJECTS) $(libdia_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(libdir) $(libdia_la_LDFLAGS) $(libdia_la_OBJECTS) $(libdia_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
diff -Nurp dia-0.93/lib/plug-ins.c dia-0.93-cygwin/lib/plug-ins.c
--- dia-0.93/lib/plug-ins.c	2003-02-16 15:04:32.000000000 +0800
+++ dia-0.93-cygwin/lib/plug-ins.c	2004-05-20 17:46:24.000000000 +0800
@@ -46,7 +46,7 @@
 #include <io.h> /* open, close */
 #endif
 
-#if defined(G_OS_WIN32) || defined(__EMX__)
+#if defined(G_PLATFORM_WIN32) || defined(__EMX__)
 #  define PLUG_IN_EXT ".dll"
 #  define PLUG_IN_EXT_LEN 4
 #  define USING_LIBTOOL 0
@@ -310,10 +310,17 @@ dia_register_plugin(const gchar *filenam
   }
 
   /* If trying to load libdia, abort */
+#ifndef __CYGWIN__  
   if (strstr(filename, "libdia.")) {
     return;
   }
+#else  
+  if (strstr(filename, "cygdia.")) {
+    return;
+  }
+#endif
 
+  printf("registering plugin: %s\n", filename);
   /* set up plugin info structure */
   info = g_new0(PluginInfo, 1);
   info->filename = g_strdup(filename);
diff -Nurp dia-0.93/objects/ER/Makefile.in dia-0.93-cygwin/objects/ER/Makefile.in
--- dia-0.93/objects/ER/Makefile.in	2004-04-30 01:14:52.000000000 +0800
+++ dia-0.93-cygwin/objects/ER/Makefile.in	2004-05-20 16:36:10.000000000 +0800
@@ -231,7 +231,7 @@ liber_objects_la_SOURCES = \
 			er.c
 
 
-liber_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
+liber_objects_la_LDFLAGS = -export-dynamic -module -avoid-version -no-undefined
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
@@ -248,7 +248,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 
-liber_objects_la_LIBADD =
+liber_objects_la_LIBADD = $(top_srcdir)/lib/libdia.la $(GTK_LIBS)
 am_liber_objects_la_OBJECTS = entity.lo relationship.lo attribute.lo \
 	participation.lo er.lo
 liber_objects_la_OBJECTS = $(am_liber_objects_la_OBJECTS)
diff -Nurp dia-0.93/objects/FS/Makefile.in dia-0.93-cygwin/objects/FS/Makefile.in
--- dia-0.93/objects/FS/Makefile.in	2004-04-30 01:14:54.000000000 +0800
+++ dia-0.93-cygwin/objects/FS/Makefile.in	2004-05-20 16:36:26.000000000 +0800
@@ -230,7 +230,7 @@ libfs_objects_la_SOURCES = \
 			function.c
 
 
-libfs_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
+libfs_objects_la_LDFLAGS = -export-dynamic -module -avoid-version -no-undefined
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
@@ -247,7 +247,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 
-libfs_objects_la_LIBADD =
+libfs_objects_la_LIBADD = $(top_srcdir)/lib/libdia.la $(GTK_LIBS)
 am_libfs_objects_la_OBJECTS = fs.lo flow.lo flow-ortho.lo function.lo
 libfs_objects_la_OBJECTS = $(am_libfs_objects_la_OBJECTS)
 
diff -Nurp dia-0.93/objects/GRAFCET/Makefile.in dia-0.93-cygwin/objects/GRAFCET/Makefile.in
--- dia-0.93/objects/GRAFCET/Makefile.in	2004-04-30 01:14:58.000000000 +0800
+++ dia-0.93-cygwin/objects/GRAFCET/Makefile.in	2004-05-20 16:36:38.000000000 +0800
@@ -238,7 +238,7 @@ libgrafcet_objects_la_SOURCES = \
 			vector.c
 
 
-libgrafcet_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
+libgrafcet_objects_la_LDFLAGS = -export-dynamic -module -avoid-version -no-undefined
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS) $(XML_CFLAGS)
 
@@ -257,7 +257,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 
-libgrafcet_objects_la_LIBADD =
+libgrafcet_objects_la_LIBADD = $(top_srcdir)/lib/libdia.la $(GTK_LIBS)
 am_libgrafcet_objects_la_OBJECTS = grafcet.lo step.lo action.lo \
 	action_text_draw.lo transition.lo boolequation.lo condition.lo \
 	vergent.lo vector.lo
diff -Nurp dia-0.93/objects/Misc/Makefile.in dia-0.93-cygwin/objects/Misc/Makefile.in
--- dia-0.93/objects/Misc/Makefile.in	2004-04-30 01:15:02.000000000 +0800
+++ dia-0.93-cygwin/objects/Misc/Makefile.in	2004-05-20 16:36:46.000000000 +0800
@@ -228,7 +228,7 @@ libmisc_objects_la_SOURCES = \
 			analog_clock.c 
 
 
-libmisc_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
+libmisc_objects_la_LDFLAGS = -export-dynamic -module -avoid-version -no-undefined
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
@@ -242,7 +242,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 
-libmisc_objects_la_LIBADD =
+libmisc_objects_la_LIBADD = $(top_srcdir)/lib/libdia.la $(GTK_LIBS)
 am_libmisc_objects_la_OBJECTS = libmisc.lo analog_clock.lo
 libmisc_objects_la_OBJECTS = $(am_libmisc_objects_la_OBJECTS)
 
diff -Nurp dia-0.93/objects/SADT/Makefile.in dia-0.93-cygwin/objects/SADT/Makefile.in
--- dia-0.93/objects/SADT/Makefile.in	2004-04-30 01:15:00.000000000 +0800
+++ dia-0.93-cygwin/objects/SADT/Makefile.in	2004-05-20 16:37:02.000000000 +0800
@@ -231,7 +231,7 @@ libsadt_objects_la_SOURCES = \
 			annotation.c 
 
 
-libsadt_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
+libsadt_objects_la_LDFLAGS = -export-dynamic -module -avoid-version -no-undefined
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
@@ -247,7 +247,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 
-libsadt_objects_la_LIBADD =
+libsadt_objects_la_LIBADD = $(top_srcdir)/lib/libdia.la $(GTK_LIBS)
 am_libsadt_objects_la_OBJECTS = sadt.lo arrow.lo box.lo annotation.lo
 libsadt_objects_la_OBJECTS = $(am_libsadt_objects_la_OBJECTS)
 
diff -Nurp dia-0.93/objects/UML/Makefile.in dia-0.93-cygwin/objects/UML/Makefile.in
--- dia-0.93/objects/UML/Makefile.in	2004-04-30 01:14:52.000000000 +0800
+++ dia-0.93-cygwin/objects/UML/Makefile.in	2004-05-20 16:37:20.000000000 +0800
@@ -256,7 +256,7 @@ libuml_objects_la_SOURCES = \
 			stereotype.h
 
 
-libuml_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
+libuml_objects_la_LDFLAGS = -export-dynamic -module -avoid-version -no-undefined
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
@@ -293,7 +293,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 
-libuml_objects_la_LIBADD =
+libuml_objects_la_LIBADD = $(top_srcdir)/lib/libdia.la $(GTK_LIBS)
 am_libuml_objects_la_OBJECTS = uml.lo class.lo class_dialog.lo note.lo \
 	actor.lo usecase.lo realizes.lo constraint.lo small_package.lo \
 	large_package.lo implements.lo generalization.lo association.lo \
diff -Nurp dia-0.93/objects/bondgraph/Makefile.in dia-0.93-cygwin/objects/bondgraph/Makefile.in
--- dia-0.93/objects/bondgraph/Makefile.in	2004-04-30 01:15:02.000000000 +0800
+++ dia-0.93-cygwin/objects/bondgraph/Makefile.in	2004-05-20 16:35:44.000000000 +0800
@@ -227,7 +227,7 @@ libbondgraph_objects_la_SOURCES = \
 			bondgraph.c
 
 
-libbondgraph_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
+libbondgraph_objects_la_LDFLAGS = -export-dynamic -module -avoid-version -no-undefined
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) \
 	$(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
@@ -239,7 +239,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 
-libbondgraph_objects_la_LIBADD =
+libbondgraph_objects_la_LIBADD = $(top_srcdir)/lib/libdia.la $(GTK_LIBS)
 am_libbondgraph_objects_la_OBJECTS = bondgraph.lo
 libbondgraph_objects_la_OBJECTS = $(am_libbondgraph_objects_la_OBJECTS)
 
diff -Nurp dia-0.93/objects/chronogram/Makefile.in dia-0.93-cygwin/objects/chronogram/Makefile.in
--- dia-0.93/objects/chronogram/Makefile.in	2004-04-30 01:14:58.000000000 +0800
+++ dia-0.93-cygwin/objects/chronogram/Makefile.in	2004-05-20 16:35:50.000000000 +0800
@@ -232,7 +232,7 @@ libchronogram_objects_la_SOURCES = \
 			chronoline_event.c
 
 
-libchronogram_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
+libchronogram_objects_la_LDFLAGS = -export-dynamic -module -avoid-version -no-undefined
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
@@ -247,7 +247,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 
-libchronogram_objects_la_LIBADD =
+libchronogram_objects_la_LIBADD = $(top_srcdir)/lib/libdia.la $(GTK_LIBS)
 am_libchronogram_objects_la_OBJECTS = chronogram.lo chronoref.lo \
 	chronoline.lo chronoline_event.lo
 libchronogram_objects_la_OBJECTS = \
diff -Nurp dia-0.93/objects/custom/Makefile.in dia-0.93-cygwin/objects/custom/Makefile.in
--- dia-0.93/objects/custom/Makefile.in	2004-04-30 01:14:56.000000000 +0800
+++ dia-0.93-cygwin/objects/custom/Makefile.in	2004-05-20 16:36:02.000000000 +0800
@@ -233,7 +233,7 @@ libcustom_objects_la_SOURCES = \
 	custom.c
 
 
-libcustom_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
+libcustom_objects_la_LDFLAGS = -export-dynamic -module -avoid-version -no-undefined
 
 shapedir = $(pkgdatadir)/shapes
 
@@ -253,7 +253,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 
-libcustom_objects_la_LIBADD =
+libcustom_objects_la_LIBADD = $(top_srcdir)/lib/libdia.la $(GTK_LIBS)
 am_libcustom_objects_la_OBJECTS = shape_info.lo custom_object.lo \
 	custom_util.lo custom.lo
 libcustom_objects_la_OBJECTS = $(am_libcustom_objects_la_OBJECTS)
diff -Nurp dia-0.93/objects/flowchart/Makefile.in dia-0.93-cygwin/objects/flowchart/Makefile.in
--- dia-0.93/objects/flowchart/Makefile.in	2004-04-30 01:14:54.000000000 +0800
+++ dia-0.93-cygwin/objects/flowchart/Makefile.in	2004-05-20 16:36:18.000000000 +0800
@@ -231,7 +231,7 @@ libflowchart_objects_la_SOURCES = \
 			flowchart.c
 
 
-libflowchart_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
+libflowchart_objects_la_LDFLAGS = -export-dynamic -module -avoid-version -no-undefined
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) \
 	$(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
@@ -250,7 +250,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 
-libflowchart_objects_la_LIBADD =
+libflowchart_objects_la_LIBADD = $(top_srcdir)/lib/libdia.la $(GTK_LIBS)
 am_libflowchart_objects_la_OBJECTS = box.lo parallelogram.lo diamond.lo \
 	ellipse.lo flowchart.lo
 libflowchart_objects_la_OBJECTS = $(am_libflowchart_objects_la_OBJECTS)
diff -Nurp dia-0.93/objects/network/Makefile.in dia-0.93-cygwin/objects/network/Makefile.in
--- dia-0.93/objects/network/Makefile.in	2004-04-30 01:14:50.000000000 +0800
+++ dia-0.93-cygwin/objects/network/Makefile.in	2004-05-20 16:36:54.000000000 +0800
@@ -230,7 +230,7 @@ libnetwork_objects_la_SOURCES = \
 			      wanlink.c 
 
 
-libnetwork_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
+libnetwork_objects_la_LDFLAGS = -export-dynamic -module -avoid-version -no-undefined
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
@@ -256,7 +256,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 
-libnetwork_objects_la_LIBADD =
+libnetwork_objects_la_LIBADD = $(top_srcdir)/lib/libdia.la $(GTK_LIBS)
 am_libnetwork_objects_la_OBJECTS = network.lo bus.lo wanlink.lo
 libnetwork_objects_la_OBJECTS = $(am_libnetwork_objects_la_OBJECTS)
 
diff -Nurp dia-0.93/objects/standard/Makefile.in dia-0.93-cygwin/objects/standard/Makefile.in
--- dia-0.93/objects/standard/Makefile.in	2004-04-30 01:14:48.000000000 +0800
+++ dia-0.93-cygwin/objects/standard/Makefile.in	2004-05-20 16:37:12.000000000 +0800
@@ -237,7 +237,7 @@ libstandard_objects_la_SOURCES = arc.c \
 			beziergon.c
 
 
-libstandard_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
+libstandard_objects_la_LDFLAGS = -export-dynamic -module -avoid-version -no-undefined
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
@@ -261,7 +261,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 
-libstandard_objects_la_LIBADD =
+libstandard_objects_la_LIBADD = $(top_srcdir)/lib/libdia.la $(GTK_LIBS)	
 am_libstandard_objects_la_OBJECTS = arc.lo box.lo ellipse.lo textobj.lo \
 	line.lo zigzagline.lo polyline.lo bezier.lo standard.lo \
 	image.lo polygon.lo beziergon.lo
diff -Nurp dia-0.93/plug-ins/cgm/Makefile.in dia-0.93-cygwin/plug-ins/cgm/Makefile.in
--- dia-0.93/plug-ins/cgm/Makefile.in	2004-04-30 01:15:04.000000000 +0800
+++ dia-0.93-cygwin/plug-ins/cgm/Makefile.in	2004-05-20 16:33:04.000000000 +0800
@@ -226,7 +226,7 @@ pkglib_LTLIBRARIES = libcgm_filter.la
 
 libcgm_filter_la_SOURCES = cgm.c
 
-libcgm_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
+libcgm_filter_la_LDFLAGS = -export-dynamic -module -avoid-version -no-undefined
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) \
 	$(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
@@ -238,7 +238,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 
-libcgm_filter_la_LIBADD =
+libcgm_filter_la_LIBADD = $(top_srcdir)/lib/libdia.la $(GTK_LIBS)
 am_libcgm_filter_la_OBJECTS = cgm.lo
 libcgm_filter_la_OBJECTS = $(am_libcgm_filter_la_OBJECTS)
 
diff -Nurp dia-0.93/plug-ins/dxf/Makefile.in dia-0.93-cygwin/plug-ins/dxf/Makefile.in
--- dia-0.93/plug-ins/dxf/Makefile.in	2004-04-30 01:15:12.000000000 +0800
+++ dia-0.93-cygwin/plug-ins/dxf/Makefile.in	2004-05-20 16:33:14.000000000 +0800
@@ -231,7 +231,7 @@ libdxf_filter_la_SOURCES = \
 	autocad_pal.h
 
 
-libdxf_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
+libdxf_filter_la_LDFLAGS = -export-dynamic -module -avoid-version -no-undefined
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) \
 	$(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(XML_CFLAGS) $(UNICODE_CFLAGS) 
@@ -243,7 +243,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 
-libdxf_filter_la_LIBADD =
+libdxf_filter_la_LIBADD = -L$(top_srcdir)/lib -ldia $(GTK_LIBS)
 am_libdxf_filter_la_OBJECTS = dxf.lo dxf-export.lo dxf-import.lo
 libdxf_filter_la_OBJECTS = $(am_libdxf_filter_la_OBJECTS)
 
diff -Nurp dia-0.93/plug-ins/hpgl/Makefile.in dia-0.93-cygwin/plug-ins/hpgl/Makefile.in
--- dia-0.93/plug-ins/hpgl/Makefile.in	2004-04-30 01:15:06.000000000 +0800
+++ dia-0.93-cygwin/plug-ins/hpgl/Makefile.in	2004-05-20 16:33:22.000000000 +0800
@@ -224,7 +224,7 @@ target_alias = @target_alias@
 pkglib_LTLIBRARIES = libhpgl_filter.la
 
 libhpgl_filter_la_SOURCES = hpgl.c
-libhpgl_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
+libhpgl_filter_la_LDFLAGS = -export-dynamic -module -avoid-version -no-undefined
 
 INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/lib \
   $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
@@ -236,7 +236,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 
-libhpgl_filter_la_LIBADD =
+libhpgl_filter_la_LIBADD = $(top_srcdir)/lib/libdia.la $(GTK_LIBS)
 am_libhpgl_filter_la_OBJECTS = hpgl.lo
 libhpgl_filter_la_OBJECTS = $(am_libhpgl_filter_la_OBJECTS)
 
diff -Nurp dia-0.93/plug-ins/metapost/Makefile.in dia-0.93-cygwin/plug-ins/metapost/Makefile.in
--- dia-0.93/plug-ins/metapost/Makefile.in	2004-04-30 01:15:16.000000000 +0800
+++ dia-0.93-cygwin/plug-ins/metapost/Makefile.in	2004-05-20 17:43:58.000000000 +0800
@@ -230,7 +230,7 @@ libmetapost_filter_la_SOURCES = \
 	render_metapost.h
 
 
-libmetapost_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
+libmetapost_filter_la_LDFLAGS = -export-dynamic -module -avoid-version -no-undefined
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
  $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(DEBUG_CFLAGS) \
@@ -243,7 +243,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 
-libmetapost_filter_la_LIBADD =
+libmetapost_filter_la_LIBADD = $(top_srcdir)/lib/libdia.la $(GTK_LIBS)
 am_libmetapost_filter_la_OBJECTS = metapost.lo render_metapost.lo
 libmetapost_filter_la_OBJECTS = $(am_libmetapost_filter_la_OBJECTS)
 
diff -Nurp dia-0.93/plug-ins/pixbuf/Makefile.in dia-0.93-cygwin/plug-ins/pixbuf/Makefile.in
--- dia-0.93/plug-ins/pixbuf/Makefile.in	2004-04-30 01:15:18.000000000 +0800
+++ dia-0.93-cygwin/plug-ins/pixbuf/Makefile.in	2004-05-20 16:33:42.000000000 +0800
@@ -228,7 +228,7 @@ libpixbuf_filter_la_SOURCES = \
 	pixbuf.c
 
 
-libpixbuf_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
+libpixbuf_filter_la_LDFLAGS = -export-dynamic -module -avoid-version -no-undefined
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(DEBUG_FLAGS)
 subdir = plug-ins/pixbuf
@@ -238,7 +238,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 
-libpixbuf_filter_la_LIBADD =
+libpixbuf_filter_la_LIBADD = $(top_srcdir)/lib/libdia.la $(GTK_LIBS)
 am_libpixbuf_filter_la_OBJECTS = pixbuf.lo
 libpixbuf_filter_la_OBJECTS = $(am_libpixbuf_filter_la_OBJECTS)
 
diff -Nurp dia-0.93/plug-ins/pstricks/Makefile.in dia-0.93-cygwin/plug-ins/pstricks/Makefile.in
--- dia-0.93/plug-ins/pstricks/Makefile.in	2004-04-30 01:15:06.000000000 +0800
+++ dia-0.93-cygwin/plug-ins/pstricks/Makefile.in	2004-05-20 16:33:52.000000000 +0800
@@ -230,7 +230,7 @@ libpstricks_filter_la_SOURCES = \
 	render_pstricks.h
 
 
-libpstricks_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
+libpstricks_filter_la_LDFLAGS = -export-dynamic -module -avoid-version -no-undefined
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) \
 	$(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS) $(DEBUG_CFLAGS)
@@ -242,7 +242,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 
-libpstricks_filter_la_LIBADD =
+libpstricks_filter_la_LIBADD = $(top_srcdir)/lib/libdia.la $(GTK_LIBS)
 am_libpstricks_filter_la_OBJECTS = pstricks.lo render_pstricks.lo
 libpstricks_filter_la_OBJECTS = $(am_libpstricks_filter_la_OBJECTS)
 
diff -Nurp dia-0.93/plug-ins/shape/Makefile.in dia-0.93-cygwin/plug-ins/shape/Makefile.in
--- dia-0.93/plug-ins/shape/Makefile.in	2004-04-30 01:15:10.000000000 +0800
+++ dia-0.93-cygwin/plug-ins/shape/Makefile.in	2004-05-20 16:34:02.000000000 +0800
@@ -229,7 +229,7 @@ libshape_filter_la_SOURCES = \
 	shape-export.c
 
 
-libshape_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
+libshape_filter_la_LDFLAGS = -export-dynamic -module -avoid-version -no-undefined
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) \
 	$(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS) $(XML_CFLAGS) \
@@ -242,7 +242,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 
-libshape_filter_la_LIBADD =
+libshape_filter_la_LIBADD = $(top_srcdir)/lib/libdia.la $(GTK_LIBS)
 am_libshape_filter_la_OBJECTS = shape.lo shape-export.lo
 libshape_filter_la_OBJECTS = $(am_libshape_filter_la_OBJECTS)
 
diff -Nurp dia-0.93/plug-ins/svg/Makefile.in dia-0.93-cygwin/plug-ins/svg/Makefile.in
--- dia-0.93/plug-ins/svg/Makefile.in	2004-04-30 01:15:10.000000000 +0800
+++ dia-0.93-cygwin/plug-ins/svg/Makefile.in	2004-05-20 16:34:10.000000000 +0800
@@ -226,7 +226,7 @@ pkglib_LTLIBRARIES = libsvg_filter.la
 
 libsvg_filter_la_SOURCES = svg.c render_svg.c svg-import.c
 
-libsvg_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
+libsvg_filter_la_LDFLAGS = -export-dynamic -module -avoid-version -no-undefined
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS) $(XML_CFLAGS) $(DEBUG_CFLAGS)
 subdir = plug-ins/svg
@@ -236,7 +236,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 
-libsvg_filter_la_LIBADD =
+libsvg_filter_la_LIBADD = $(top_srcdir)/lib/libdia.la $(GTK_LIBS)
 am_libsvg_filter_la_OBJECTS = svg.lo render_svg.lo svg-import.lo
 libsvg_filter_la_OBJECTS = $(am_libsvg_filter_la_OBJECTS)
 
diff -Nurp dia-0.93/plug-ins/wpg/Makefile.in dia-0.93-cygwin/plug-ins/wpg/Makefile.in
--- dia-0.93/plug-ins/wpg/Makefile.in	2004-04-30 01:15:08.000000000 +0800
+++ dia-0.93-cygwin/plug-ins/wpg/Makefile.in	2004-05-20 16:34:20.000000000 +0800
@@ -224,7 +224,7 @@ target_alias = @target_alias@
 pkglib_LTLIBRARIES = libwpg_filter.la
 
 libwpg_filter_la_SOURCES = wpg.c wpg_defs.h
-libwpg_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
+libwpg_filter_la_LDFLAGS = -export-dynamic -module -avoid-version -no-undefined
 
 INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/lib \
   $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS) \
@@ -237,7 +237,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 
-libwpg_filter_la_LIBADD =
+libwpg_filter_la_LIBADD = $(top_srcdir)/lib/libdia.la $(GTK_LIBS)
 am_libwpg_filter_la_OBJECTS = wpg.lo
 libwpg_filter_la_OBJECTS = $(am_libwpg_filter_la_OBJECTS)
 
diff -Nurp dia-0.93/plug-ins/xfig/Makefile.in dia-0.93-cygwin/plug-ins/xfig/Makefile.in
--- dia-0.93/plug-ins/xfig/Makefile.in	2004-04-30 01:15:14.000000000 +0800
+++ dia-0.93-cygwin/plug-ins/xfig/Makefile.in	2004-05-20 16:34:30.000000000 +0800
@@ -232,7 +232,7 @@ libxfig_filter_la_SOURCES = \
 	xfig.h
 
 
-libxfig_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
+libxfig_filter_la_LDFLAGS = -export-dynamic -module -avoid-version -no-undefined
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(XML_CFLAGS) $(UNICODE_CFLAGS) $(DEBUG_FLAGS)
 subdir = plug-ins/xfig
@@ -242,7 +242,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 
-libxfig_filter_la_LIBADD =
+libxfig_filter_la_LIBADD = $(top_srcdir)/lib/libdia.la $(GTK_LIBS)
 am_libxfig_filter_la_OBJECTS = xfig.lo xfig-import.lo xfig-export.lo \
 	xfig-common.lo
 libxfig_filter_la_OBJECTS = $(am_libxfig_filter_la_OBJECTS)
diff -Nurp dia-0.93/plug-ins/xslt/Makefile.in dia-0.93-cygwin/plug-ins/xslt/Makefile.in
--- dia-0.93/plug-ins/xslt/Makefile.in	2004-04-30 01:15:18.000000000 +0800
+++ dia-0.93-cygwin/plug-ins/xslt/Makefile.in	2004-05-20 16:34:40.000000000 +0800
@@ -241,9 +241,9 @@ pkglib_LTLIBRARIES = libxslt_filter.la
 
 libxslt_filter_la_SOURCES = $(plugin_sources)
 
-libxslt_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
+libxslt_filter_la_LDFLAGS = -export-dynamic -module -avoid-version -no-undefined
 
-libxslt_filter_la_LIBADD = $(XSLT_LIBS)
+libxslt_filter_la_LIBADD =  $(top_srcdir)/lib/libdia.la $(GTK_LIBS) $(XSLT_LIBS)
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(XML_CFLAGS) $(UNICODE_CFLAGS) $(DEBUG_FLAGS) $(XSLT_CFLAGS)
 subdir = plug-ins/xslt
