fdo#55514 libgmodule is needed too

Change-Id: Icee2ffbe18ea732220f174cd4bf433ceb03d128b

config_host.mk.in

@@ -366,6 +366,7 @@ export MINGW_FREETYPE_DLL=@MINGW_FREETYPE_DLL@
 export MINGW_GCCDLL=@MINGW_GCCDLL@
 export MINGW_GCRYPT_DLL=@MINGW_GCRYPT_DLL@
 export MINGW_GLIB_DLL=@MINGW_GLIB_DLL@
+export MINGW_GMODULE_DLL=@MINGW_GMODULE_DLL@
 export MINGW_GNUTLS_DLL=@MINGW_GNUTLS_DLL@
 export MINGW_GPG_ERROR_DLL=@MINGW_GPG_ERROR_DLL@
 export MINGW_GRAPHITE2_DLL=@MINGW_GRAPHITE2_DLL@

configure.ac

@@ -11592,6 +11592,7 @@ if test "$enable_liblangtag" = "yes" -o \( "$enable_liblangtag" = "" -a $_os !=
         PKG_CHECK_MODULES( LIBLANGTAG, liblangtag >= 0.3)
         libo_MINGW_CHECK_DLL([LIBLANGTAG], [liblangtag])
         libo_MINGW_TRY_DLL([GLIB], [libglib-2.0])
+        libo_MINGW_TRY_DLL([GMODULE], [libgmodule-2.0])
     else
         SYSTEM_LIBLANGTAG=NO
         AC_MSG_RESULT([no])
@@ -11607,6 +11608,7 @@ AC_SUBST(LIBLANGTAG_CFLAGS)
 AC_SUBST(LIBLANGTAG_LIBS)
 AC_SUBST([MINGW_LIBLANGTAG_DLL])
 AC_SUBST([MINGW_GLIB_DLL])
+AC_SUBST([MINGW_GMODULE_DLL])
 
 dnl ===================================================================
 dnl Test whether to build GLib or rely on the system version
@@ -11631,6 +11633,7 @@ if test "$want_glib" = yes; then
         SYSTEM_GLIB=YES
         PKG_CHECK_MODULES( GLIB, glib-2.0 )
         libo_MINGW_CHECK_DLL([GLIB], [libglib-2.0])
+        libo_MINGW_TRY_DLL([GMODULE], [libgmodule-2.0])
     else
         AC_MSG_RESULT([internal])
         SYSTEM_GLIB=NO

external/mingw-dlls/makefile.mk

@@ -52,6 +52,7 @@ MINGW_DLLS:= \
     $(MINGW_FREETYPE_DLL) \
     $(MINGW_GCRYPT_DLL) \
     $(MINGW_GLIB_DLL) \
+    $(MINGW_GMODULE_DLL) \
     $(MINGW_GNUTLS_DLL) \
     $(MINGW_GPG_ERROR_DLL) \
     $(MINGW_GRAPHITE2_DLL) \

scp2/InstallModule_ooo.mk

@@ -101,6 +101,7 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\
 	MINGW_FREETYPE_DLL \
 	MINGW_GCRYPT_DLL \
 	MINGW_GLIB_DLL \
+	MINGW_GMODULE_DLL \
 	MINGW_GNUTLS_DLL \
 	MINGW_GPG_ERROR_DLL \
 	MINGW_GRAPHITE2_DLL \

scp2/source/ooo/mingw_dlls.scp

@@ -46,10 +46,13 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Libexpat, MINGW_EXPAT_DLL )
 #endif
 #endif
 
-#ifdef SYSTEM_GLIB
+#if defined SYSTEM_GLIB || defined SYSTEM_LIBLANGTAG
 #ifdef NEEDS_MINGW_GLIB_DLL
 MINGW_DLL( gid_Brand_File_Lib_Mingw_Glib, MINGW_GLIB_DLL )
 #endif
+#ifdef NEEDS_MINGW_GMODULE_DLL
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Gmodule, MINGW_GMODULE_DLL )
+#endif
 #endif
 
 #ifdef SYSTEM_LIBLANGTAG