mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add build support for libexslt

Browse Source 
Change-Id: I539acd19fa8a0dc1a89a7a172ecad2a03ebc5d7b
This commit is contained in:
David Tardon 2012-08-15 07:20:13 +02:00
parent dfe544c87b
commit ab03e87741
6 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
RepositoryExternal.mk
View File

@ -411,9 +411,20 @@ $(call gb_LinkTarget_add_libs,$(1),$(LIBXSLT_LIBS))
endef 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 else # !SYSTEM_LIBXSLT
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
exslt \
xslt \ xslt \
)) ))
@ -424,6 +435,13 @@ $(call gb_LinkTarget_use_libraries,$(1),\
endef endef
define gb_LinkTarget__use_libexslt
$(call gb_LinkTarget_use_libraries,$(1),\
exslt \
)
endef
endif # SYSTEM_LIBXSLT endif # SYSTEM_LIBXSLT

3
config_host.mk.in
View File

@ -275,6 +275,8 @@ export LIBBASE_JAR=@LIBBASE_JAR@
export LIBCMIS_CFLAGS=@LIBCMIS_CFLAGS@ export LIBCMIS_CFLAGS=@LIBCMIS_CFLAGS@
export LIBCMIS_LIBS=@LIBCMIS_LIBS@ export LIBCMIS_LIBS=@LIBCMIS_LIBS@
export LIBDIR=@LIBDIR@ export LIBDIR=@LIBDIR@
export LIBEXSLT_CFLAGS=@LIBEXSLT_CFLAGS@
export LIBEXSLT_LIBS=@LIBEXSLT_LIBS@
export LIBEXTTEXTCAT_CFLAGS=@LIBEXTTEXTCAT_CFLAGS@ export LIBEXTTEXTCAT_CFLAGS=@LIBEXTTEXTCAT_CFLAGS@
export LIBEXTTEXTCAT_LIBS=@LIBEXTTEXTCAT_LIBS@ export LIBEXTTEXTCAT_LIBS=@LIBEXTTEXTCAT_LIBS@
export LIBFONTS_JAR=@LIBFONTS_JAR@ 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_INTL_DLL=@MINGW_INTL_DLL@
export MINGW_JPEG_DLL=@MINGW_JPEG_DLL@ export MINGW_JPEG_DLL=@MINGW_JPEG_DLL@
export MINGW_LCMS2_DLL=@MINGW_LCMS2_DLL@ export MINGW_LCMS2_DLL=@MINGW_LCMS2_DLL@
export MINGW_LIBEXSLT_DLL=@MINGW_LIBEXSLT_DLL@
export MINGW_LIBXML_DLL=@MINGW_LIBXML_DLL@ export MINGW_LIBXML_DLL=@MINGW_LIBXML_DLL@
export MINGW_LIBXSLT_DLL=@MINGW_LIBXSLT_DLL@ export MINGW_LIBXSLT_DLL=@MINGW_LIBXSLT_DLL@
export MINGW_LPSOLVE_DLL=@MINGW_LPSOLVE_DLL@ export MINGW_LPSOLVE_DLL=@MINGW_LPSOLVE_DLL@

7
configure.in
View File

@ -6721,10 +6721,13 @@ if test "$with_system_libxml" = "yes"; then
if test "$_os" = "Darwin"; then if test "$_os" = "Darwin"; then
dnl make sure to use SDK path dnl make sure to use SDK path
LIBXSLT_CFLAGS="-I$MACOSX_SDK_PATH/usr/include/libxml2" LIBXSLT_CFLAGS="-I$MACOSX_SDK_PATH/usr/include/libxml2"
LIBEXSLT_CFLAGS="$LIBXSLT_CFLAGS"
dnl omit -L/usr/lib dnl omit -L/usr/lib
LIBXSLT_LIBS="-lxslt -lxml2 -lz -lpthread -liconv -lm" LIBXSLT_LIBS="-lxslt -lxml2 -lz -lpthread -liconv -lm"
LIBEXSLT_LIBS="-lexslt $LIBXSLT_LIBS"
else else
PKG_CHECK_MODULES(LIBXSLT, libxslt) PKG_CHECK_MODULES(LIBXSLT, libxslt)
PKG_CHECK_MODULES(LIBEXSLT, libexslt)
fi fi
dnl Check for xsltproc dnl Check for xsltproc
@ -6734,6 +6737,7 @@ if test "$with_system_libxml" = "yes"; then
fi fi
libo_MINGW_CHECK_DLL([LIBXSLT], [libxslt]) libo_MINGW_CHECK_DLL([LIBXSLT], [libxslt])
libo_MINGW_CHECK_DLL([LIBEXSLT], [libexslt])
libo_MINGW_TRY_DLL([ICONV], [iconv]) libo_MINGW_TRY_DLL([ICONV], [iconv])
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
@ -6753,9 +6757,12 @@ if test -z "$SYSTEM_LIBXSLT_FOR_BUILD"; then
fi fi
AC_SUBST(SYSTEM_LIBXSLT_FOR_BUILD) AC_SUBST(SYSTEM_LIBXSLT_FOR_BUILD)
AC_SUBST(LIBEXSLT_CFLAGS)
AC_SUBST(LIBEXSLT_LIBS)
AC_SUBST(LIBXSLT_CFLAGS) AC_SUBST(LIBXSLT_CFLAGS)
AC_SUBST(LIBXSLT_LIBS) AC_SUBST(LIBXSLT_LIBS)
AC_SUBST(XSLTPROC) AC_SUBST(XSLTPROC)
AC_SUBST([MINGW_LIBEXSLT_DLL])
AC_SUBST([MINGW_LIBXSLT_DLL]) AC_SUBST([MINGW_LIBXSLT_DLL])
AC_SUBST([MINGW_ICONV_DLL]) AC_SUBST([MINGW_ICONV_DLL])

1
external/mingw-dlls/makefile.mk vendored
View File

@ -64,6 +64,7 @@ MINGW_DLLS:= \
$(MINGW_INTL_DLL) \ $(MINGW_INTL_DLL) \
$(MINGW_JPEG_DLL) \ $(MINGW_JPEG_DLL) \
$(MINGW_LCMS2_DLL) \ $(MINGW_LCMS2_DLL) \
$(MINGW_LIBEXSLT_DLL) \
$(MINGW_LIBXML_DLL) \ $(MINGW_LIBXML_DLL) \
$(MINGW_LIBXSLT_DLL) \ $(MINGW_LIBXSLT_DLL) \
$(MINGW_LPSOLVE_DLL) \ $(MINGW_LPSOLVE_DLL) \

1
scp2/InstallModule_ooo.mk
View File

@ -115,6 +115,7 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\
MINGW_INTL_DLL \ MINGW_INTL_DLL \
MINGW_JPEG_DLL \ MINGW_JPEG_DLL \
MINGW_LCMS2_DLL \ MINGW_LCMS2_DLL \
MINGW_LIBEXSLT_DLL \
MINGW_LIBXML_DLL \ MINGW_LIBXML_DLL \
MINGW_LIBXSLT_DLL \ MINGW_LIBXSLT_DLL \
MINGW_LPSOLVE_DLL \ MINGW_LPSOLVE_DLL \

3
scp2/source/ooo/mingw_dlls.scp
View File

@ -47,6 +47,9 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Libexpat, MINGW_EXPAT_DLL )
#endif #endif
#ifdef SYSTEM_LIBXSLT #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 #ifdef NEEDS_MINGW_LIBXSLT_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libxslt, MINGW_LIBXSLT_DLL ) MINGW_DLL( gid_Brand_File_Lib_Mingw_Libxslt, MINGW_LIBXSLT_DLL )
#endif #endif