Kaydet (Commit) 9339da86 authored tarafından David Tardon's avatar David Tardon

mingw: check for system iconv dll

libxslt in Fedora mingw packages depends on it.
üst dd875e4f
......@@ -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@
......
......@@ -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
......
......@@ -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) \
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment