fdo#55514 put liblangtag dll to install set

Change-Id: Ia2df651604358c70c0af129b5d60b149d2f1629e

5 files changed, 23 insertions, 0 deletions

diff --git a/config_host.mk.in b/config_host.mk.in
index f8566af96a0e..31f40b1abaa7 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -367,6 +367,7 @@ export MINGW_FONTCONFIG_DLL=@MINGW_FONTCONFIG_DLL@
 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_GNUTLS_DLL=@MINGW_GNUTLS_DLL@
 export MINGW_GPG_ERROR_DLL=@MINGW_GPG_ERROR_DLL@
 export MINGW_GRAPHITE2_DLL=@MINGW_GRAPHITE2_DLL@
@@ -382,6 +383,7 @@ export MINGW_INTL_DLL=@MINGW_INTL_DLL@
 export MINGW_JPEG_DLL=@MINGW_JPEG_DLL@
 export MINGW_LCMS2_DLL=@MINGW_LCMS2_DLL@
 export MINGW_LIBEXSLT_DLL=@MINGW_LIBEXSLT_DLL@
+export MINGW_LIBLANGTAG_DLL=@MINGW_LIBLANGTAG_DLL@
 export MINGW_LIBXML_DLL=@MINGW_LIBXML_DLL@
 export MINGW_LIBXSLT_DLL=@MINGW_LIBXSLT_DLL@
 export MINGW_LPSOLVE_DLL=@MINGW_LPSOLVE_DLL@
diff --git a/configure.ac b/configure.ac
index 78c2e3fc8493..978f3b821b70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11589,6 +11589,8 @@ if test "$enable_liblangtag" = "yes" -o \( "$enable_liblangtag" = "" -a $_os !=
         SYSTEM_LIBLANGTAG=YES
         AC_MSG_RESULT([yes])
         PKG_CHECK_MODULES( LIBLANGTAG, liblangtag >= 0.3)
+        libo_MINGW_CHECK_DLL([LIBLANGTAG], [liblangtag])
+        libo_MINGW_TRY_DLL([GLIB], [libglib-2.0])
     else
         SYSTEM_LIBLANGTAG=NO
         AC_MSG_RESULT([no])
@@ -11602,6 +11604,8 @@ AC_SUBST(ENABLE_LIBLANGTAG)
 AC_SUBST(SYSTEM_LIBLANGTAG)
 AC_SUBST(LIBLANGTAG_CFLAGS)
 AC_SUBST(LIBLANGTAG_LIBS)
+AC_SUBST([MINGW_LIBLANGTAG_DLL])
+AC_SUBST([MINGW_GLIB_DLL])
 
 dnl ===================================================================
 dnl Test whether to build GLib or rely on the system version
@@ -11625,6 +11629,7 @@ if test "$want_glib" = yes; then
         AC_MSG_RESULT([external])
         SYSTEM_GLIB=YES
         PKG_CHECK_MODULES( GLIB, glib-2.0 )
+        libo_MINGW_CHECK_DLL([GLIB], [libglib-2.0])
     else
         AC_MSG_RESULT([internal])
         SYSTEM_GLIB=NO
diff --git a/external/mingw-dlls/makefile.mk b/external/mingw-dlls/makefile.mk
index 3aa71cfb0d47..b6d967cc10bb 100644
--- a/external/mingw-dlls/makefile.mk
+++ b/external/mingw-dlls/makefile.mk
@@ -51,6 +51,7 @@ MINGW_DLLS:= \
     $(MINGW_FONTCONFIG_DLL) \
     $(MINGW_FREETYPE_DLL) \
     $(MINGW_GCRYPT_DLL) \
+    $(MINGW_GLIB_DLL) \
     $(MINGW_GNUTLS_DLL) \
     $(MINGW_GPG_ERROR_DLL) \
     $(MINGW_GRAPHITE2_DLL) \
@@ -65,6 +66,7 @@ MINGW_DLLS:= \
     $(MINGW_JPEG_DLL) \
     $(MINGW_LCMS2_DLL) \
     $(MINGW_LIBEXSLT_DLL) \
+    $(MINGW_LIBLANGTAG_DLL) \
     $(MINGW_LIBXML_DLL) \
     $(MINGW_LIBXSLT_DLL) \
     $(MINGW_LPSOLVE_DLL) \
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index ddd498d3e6c3..d33d6db8b267 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -100,6 +100,7 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\
 	MINGW_FONTCONFIG_DLL \
 	MINGW_FREETYPE_DLL \
 	MINGW_GCRYPT_DLL \
+	MINGW_GLIB_DLL \
 	MINGW_GNUTLS_DLL \
 	MINGW_GPG_ERROR_DLL \
 	MINGW_GRAPHITE2_DLL \
@@ -114,6 +115,7 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\
 	MINGW_JPEG_DLL \
 	MINGW_LCMS2_DLL \
 	MINGW_LIBEXSLT_DLL \
+	MINGW_LIBLANGTAG_DLL \
 	MINGW_LIBXML_DLL \
 	MINGW_LIBXSLT_DLL \
 	MINGW_LPSOLVE_DLL \
diff --git a/scp2/source/ooo/mingw_dlls.scp b/scp2/source/ooo/mingw_dlls.scp
index 33f7d6778f4a..4588225a961e 100644
--- a/scp2/source/ooo/mingw_dlls.scp
+++ b/scp2/source/ooo/mingw_dlls.scp
@@ -46,6 +46,18 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Libexpat, MINGW_EXPAT_DLL )
 #endif
 #endif
 
+#ifdef SYSTEM_GLIB
+#ifdef NEEDS_MINGW_GLIB_DLL
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Glib, MINGW_GLIB_DLL )
+#endif
+#endif
+
+#ifdef SYSTEM_LIBLANGTAG
+#ifdef NEEDS_MINGW_LIBLANGTAG_DLL
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Liblangtag, MINGW_LIBLANGTAG_DLL )
+#endif
+#endif
+
 #ifdef SYSTEM_LIBXSLT
 #ifdef NEEDS_MINGW_LIBEXSLT_DLL
 MINGW_DLL( gid_Brand_File_Lib_Mingw_Libexslt, MINGW_LIBEXSLT_DLL )