Merge branch '2918_cygwin_test_build'

* 2918_cygwin_test_build:
  Ticket #2918: cygwin test failure.

m4.include/mc-tests.m4

@@ -22,4 +22,16 @@ AC_DEFUN([MC_UNIT_TESTS],[
             [AC_MSG_WARN(['Check' utility not found. Check your environment])])
     fi
     AM_CONDITIONAL(HAVE_TESTS, test x"$have_check" = "xyes")
+
+    # on cygwin, the linker does not accept the "-z" option
+    case $host_os in
+        cygwin*)
+            TESTS_LDFLAGS="-Wl,--allow-multiple-definition"
+            ;;
+        *)
+            TESTS_LDFLAGS="-Wl,-z,muldefs"
+            ;;
+    esac
+
+    AC_SUBST(TESTS_LDFLAGS)
 ])

tests/lib/mcconfig/Makefile.am

@@ -2,7 +2,7 @@
 AM_CPPFLAGS = -DWORKDIR=\"$(abs_builddir)\"
 AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) @CHECK_CFLAGS@
 
-AM_LDFLAGS = -Wl,-z,muldefs
+AM_LDFLAGS = @TESTS_LDFLAGS@
 
 LIBS=@CHECK_LIBS@  $(top_builddir)/lib/libmc.la
 

tests/lib/vfs/Makefile.am

@@ -2,7 +2,7 @@
 AM_CPPFLAGS = -DTEST_SHARE_DIR=\"$(abs_srcdir)\"
 AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib/vfs $(GLIB_CFLAGS) @CHECK_CFLAGS@
 
-AM_LDFLAGS = -Wl,-z,muldefs
+AM_LDFLAGS = @TESTS_LDFLAGS@
 
 EXTRA_DIST = mc.charsets
 

tests/src/filemanager/Makefile.am

@@ -1,6 +1,6 @@
 AM_CFLAGS = -I$(top_srcdir)/lib/vfs $(GLIB_CFLAGS) -I$(top_srcdir) @CHECK_CFLAGS@
 
-AM_LDFLAGS = -Wl,-z,muldefs
+AM_LDFLAGS = @TESTS_LDFLAGS@
 
 LIBS=@CHECK_LIBS@  \
 	$(top_builddir)/src/libinternal.la \