diff options
| -rw-r--r-- | RepositoryExternal.mk | 18 | ||||
| -rw-r--r-- | config_host.mk.in | 3 | ||||
| -rw-r--r-- | configure.in | 7 | ||||
| -rw-r--r-- | external/mingw-dlls/makefile.mk | 1 | ||||
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/mingw_dlls.scp | 3 |
6 files changed, 33 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 0d6c660efaae..4b8bfe934866 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -411,9 +411,20 @@ $(call gb_LinkTarget_add_libs,$(1),$(LIBXSLT_LIBS)) endef +define gb_LinkTarget__use_libexslt +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(LIBEXSLT_CFLAGS) \ +) + +$(call gb_LinkTarget_add_libs,$(1),$(LIBEXSLT_LIBS)) + +endef + else # !SYSTEM_LIBXSLT $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ + exslt \ xslt \ )) @@ -424,6 +435,13 @@ $(call gb_LinkTarget_use_libraries,$(1),\ endef +define gb_LinkTarget__use_libexslt +$(call gb_LinkTarget_use_libraries,$(1),\ + exslt \ +) + +endef + endif # SYSTEM_LIBXSLT diff --git a/config_host.mk.in b/config_host.mk.in index 7289d55a3110..a3723abe0b37 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -275,6 +275,8 @@ export LIBBASE_JAR=@LIBBASE_JAR@ export LIBCMIS_CFLAGS=@LIBCMIS_CFLAGS@ export LIBCMIS_LIBS=@LIBCMIS_LIBS@ export LIBDIR=@LIBDIR@ +export LIBEXSLT_CFLAGS=@LIBEXSLT_CFLAGS@ +export LIBEXSLT_LIBS=@LIBEXSLT_LIBS@ export LIBEXTTEXTCAT_CFLAGS=@LIBEXTTEXTCAT_CFLAGS@ export LIBEXTTEXTCAT_LIBS=@LIBEXTTEXTCAT_LIBS@ export LIBFONTS_JAR=@LIBFONTS_JAR@ @@ -333,6 +335,7 @@ export MINGW_IDN_DLL=@MINGW_IDN_DLL@ 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_LIBXML_DLL=@MINGW_LIBXML_DLL@ export MINGW_LIBXSLT_DLL=@MINGW_LIBXSLT_DLL@ export MINGW_LPSOLVE_DLL=@MINGW_LPSOLVE_DLL@ diff --git a/configure.in b/configure.in index 95bd0dbba294..76a29106c390 100644 --- a/configure.in +++ b/configure.in @@ -6721,10 +6721,13 @@ if test "$with_system_libxml" = "yes"; then if test "$_os" = "Darwin"; then dnl make sure to use SDK path LIBXSLT_CFLAGS="-I$MACOSX_SDK_PATH/usr/include/libxml2" + LIBEXSLT_CFLAGS="$LIBXSLT_CFLAGS" dnl omit -L/usr/lib LIBXSLT_LIBS="-lxslt -lxml2 -lz -lpthread -liconv -lm" + LIBEXSLT_LIBS="-lexslt $LIBXSLT_LIBS" else PKG_CHECK_MODULES(LIBXSLT, libxslt) + PKG_CHECK_MODULES(LIBEXSLT, libexslt) fi dnl Check for xsltproc @@ -6734,6 +6737,7 @@ if test "$with_system_libxml" = "yes"; then fi libo_MINGW_CHECK_DLL([LIBXSLT], [libxslt]) + libo_MINGW_CHECK_DLL([LIBEXSLT], [libexslt]) libo_MINGW_TRY_DLL([ICONV], [iconv]) else AC_MSG_RESULT([internal]) @@ -6753,9 +6757,12 @@ if test -z "$SYSTEM_LIBXSLT_FOR_BUILD"; then fi AC_SUBST(SYSTEM_LIBXSLT_FOR_BUILD) +AC_SUBST(LIBEXSLT_CFLAGS) +AC_SUBST(LIBEXSLT_LIBS) AC_SUBST(LIBXSLT_CFLAGS) AC_SUBST(LIBXSLT_LIBS) AC_SUBST(XSLTPROC) +AC_SUBST([MINGW_LIBEXSLT_DLL]) AC_SUBST([MINGW_LIBXSLT_DLL]) AC_SUBST([MINGW_ICONV_DLL]) diff --git a/external/mingw-dlls/makefile.mk b/external/mingw-dlls/makefile.mk index 7fe6b4aab0d2..8a7b3c5e18e6 100644 --- a/external/mingw-dlls/makefile.mk +++ b/external/mingw-dlls/makefile.mk @@ -64,6 +64,7 @@ MINGW_DLLS:= \ $(MINGW_INTL_DLL) \ $(MINGW_JPEG_DLL) \ $(MINGW_LCMS2_DLL) \ + $(MINGW_LIBEXSLT_DLL) \ $(MINGW_LIBXML_DLL) \ $(MINGW_LIBXSLT_DLL) \ $(MINGW_LPSOLVE_DLL) \ diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 97a007de666e..ac1429941f1f 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -115,6 +115,7 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\ MINGW_INTL_DLL \ MINGW_JPEG_DLL \ MINGW_LCMS2_DLL \ + MINGW_LIBEXSLT_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 82a5dc1ad83e..7124530a3ddd 100644 --- a/scp2/source/ooo/mingw_dlls.scp +++ b/scp2/source/ooo/mingw_dlls.scp @@ -47,6 +47,9 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Libexpat, MINGW_EXPAT_DLL ) #endif #ifdef SYSTEM_LIBXSLT +#ifdef NEEDS_MINGW_LIBEXSLT_DLL +MINGW_DLL( gid_Brand_File_Lib_Mingw_Libexslt, MINGW_LIBEXSLT_DLL ) +#endif #ifdef NEEDS_MINGW_LIBXSLT_DLL MINGW_DLL( gid_Brand_File_Lib_Mingw_Libxslt, MINGW_LIBXSLT_DLL ) #endif |