[gtk+/gtk-2-24] Makefiles: cross-compilation on Linux for Windows failing.

[Jehan Pagès <jehanp src gnome org>]

commit ab3e3b1834ff0e8a98fd689bbb85b84f3cbbc962
Author: Jehan <jehan girinstud io>
Date:   Thu Oct 24 19:42:44 2013 +1300

    Makefiles: cross-compilation on Linux for Windows failing.
    
    Missing linking information for some modules.

 modules/engines/ms-windows/Makefile.am |    6 ++++--
 modules/other/gail/Makefile.am         |    7 +++++++
 2 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/modules/engines/ms-windows/Makefile.am b/modules/engines/ms-windows/Makefile.am
index d86fa2c..45fa5a0 100644
--- a/modules/engines/ms-windows/Makefile.am
+++ b/modules/engines/ms-windows/Makefile.am
@@ -9,13 +9,15 @@ INCLUDES = \
        -I$(top_srcdir)/gdk             \
        -I$(top_builddir)/gdk           \
        -DGDK_DISABLE_DEPRECATED        \
-       $(GTK_DEP_CFLAGS)
+       $(GTK_DEP_CFLAGS)       \
+       $(GMODULE_CFLAGS)
 
 
 LDADDS = \
        $(top_builddir)/gdk/$(gdktargetlib)             \
        $(top_builddir)/gtk/$(gtktargetlib)             \
-       $(GTK_DEP_LIBS)
+       $(GTK_DEP_LIBS)         \
+       $(GMODULE_LIBS)
 
 enginedir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/engines
 
diff --git a/modules/other/gail/Makefile.am b/modules/other/gail/Makefile.am
index 8272e3f..991512d 100644
--- a/modules/other/gail/Makefile.am
+++ b/modules/other/gail/Makefile.am
@@ -151,9 +151,15 @@ libgail_la_CPPFLAGS = \
        -DGTK_DISABLE_DEPRECATED        \
        $(AM_CPPFLAGS)
 
+if PLATFORM_WIN32
+WIN32_ADDITIONAL_CFLAGS = $(GMODULE_CFLAGS)
+WIN32_ADDITIONAL_LIBS = $(GMODULE_LIBS)
+endif
+
 libgail_la_CFLAGS = \
        $(GTK_DEP_CFLAGS)       \
        $(GTK_DEBUG_FLAGS)      \
+       $(WIN32_ADDITIONAL_CFLAGS)              \
        $(AM_CFLAGS)
 
 libgail_la_LIBADD =  \
@@ -161,6 +167,7 @@ libgail_la_LIBADD =  \
        $(top_builddir)/gtk/$(gtktargetlib)                             \
        $(top_builddir)/modules/other/gail/libgail-util/libgailutil.la  \
        $(GTK_DEP_LIBS)                                                 \
+       $(WIN32_ADDITIONAL_LIBS)                \
        $(INTLLIBS)
 
 libgail_la_LDFLAGS =    \