diff options
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | external/mingw-dlls/makefile.mk | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/makefile.mk | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/mingw_dlls.scp | 3 |
5 files changed, 11 insertions, 0 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 050417ebbb71..002ff8e24f97 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -292,6 +292,7 @@ export MINGW_GRAPHITE2_DLL=@MINGW_GRAPHITE2_DLL@ export MINGW_GXXDLL=@MINGW_GXXDLL@ export MINGW_HUNSPELL_DLL=@MINGW_HUNSPELL_DLL@ export MINGW_HYPHEN_DLL=@MINGW_HYPHEN_DLL@ +export MINGW_ICONV_DLL=@MINGW_ICONV_DLL@ export MINGW_ICUDATA_DLL=@MINGW_ICUDATA_DLL@ export MINGW_ICUI18N_DLL=@MINGW_ICUI18N_DLL@ export MINGW_ICUUC_DLL=@MINGW_ICUUC_DLL@ diff --git a/configure.in b/configure.in index 65200c88c448..68a0e3b9b952 100644 --- a/configure.in +++ b/configure.in @@ -6034,6 +6034,7 @@ if test "$with_system_libxml" = "yes"; then fi libo_MINGW_CHECK_DLL([LIBXSLT], [libxslt]) + libo_MINGW_TRY_DLL([ICONV], [iconv]) else AC_MSG_RESULT([internal]) SYSTEM_LIBXSLT=NO @@ -6056,6 +6057,7 @@ AC_SUBST(LIBXSLT_CFLAGS) AC_SUBST(LIBXSLT_LIBS) AC_SUBST(XSLTPROC) AC_SUBST([MINGW_LIBXSLT_DLL]) +AC_SUBST([MINGW_ICONV_DLL]) # =================================================================== # Check for system libxml diff --git a/external/mingw-dlls/makefile.mk b/external/mingw-dlls/makefile.mk index d312c346e35b..bc64b273441b 100644 --- a/external/mingw-dlls/makefile.mk +++ b/external/mingw-dlls/makefile.mk @@ -55,6 +55,7 @@ MINGW_DLLS:= \ $(MINGW_GRAPHITE2_DLL) \ $(MINGW_HUNSPELL_DLL) \ $(MINGW_HYPHEN_DLL) \ + $(MINGW_ICONV_DLL) \ $(MINGW_ICUDATA_DLL) \ $(MINGW_ICUI18N_DLL) \ $(MINGW_ICUUC_DLL) \ diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index ff840f5076c6..3d8c06857b2e 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -309,6 +309,10 @@ SCPDEFS += -DNEEDS_MINGW_HUNSPELL_DLL -DMINGW_HUNSPELL_DLL=\""$(MINGW_HUNSPELL_D SCPDEFS += -DNEEDS_MINGW_HYPHEN_DLL -DMINGW_HYPHEN_DLL=\""$(MINGW_HYPHEN_DLL)"\" .ENDIF +.IF "$(MINGW_ICONV_DLL)" != "" +SCPDEFS += -DNEEDS_MINGW_ICONV_DLL -DMINGW_ICONV_DLL=\""$(MINGW_ICONV_DLL)"\" +.ENDIF + .IF "$(MINGW_ICUDATA_DLL)" != "" SCPDEFS += -DNEEDS_MINGW_ICUDATA_DLL -DMINGW_ICUDATA_DLL=\""$(MINGW_ICUDATA_DLL)"\" .ENDIF diff --git a/scp2/source/ooo/mingw_dlls.scp b/scp2/source/ooo/mingw_dlls.scp index 0cd23b3ce8a3..4dff90cc10e0 100644 --- a/scp2/source/ooo/mingw_dlls.scp +++ b/scp2/source/ooo/mingw_dlls.scp @@ -50,6 +50,9 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Libexpat, MINGW_EXPAT_DLL ) #ifdef NEEDS_MINGW_LIBXSLT_DLL MINGW_DLL( gid_Brand_File_Lib_Mingw_Libxslt, MINGW_LIBXSLT_DLL ) #endif +#ifdef NEEDS_MINGW_ICONV_DLL +MINGW_DLL( gid_Brand_File_Lib_Mingw_Libxslt, MINGW_ICONV_DLL ) +#endif #endif #ifdef SYSTEM_LIBXML |