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

Fix the --disable-xmlsec build.

Browse Source
This commit is contained in:
Jan Holesovsky
2011-11-03 21:05:23 +01:00
parent e53ac9984c
commit a1c23a44b9
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
configure.in
View File

@@ -4862,12 +4862,11 @@ if test -n "$with_system_libxml" -o -n "$with_system_libs" -o \
else else
PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.0) PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.0)
fi fi
BUILD_TYPE="$BUILD_TYPE LIBXMLSEC"
MINGW_EXTERNAL_DLLS="$MINGW_EXTERNAL_DLLS zlib1.dll libxml2-2.dll" MINGW_EXTERNAL_DLLS="$MINGW_EXTERNAL_DLLS zlib1.dll libxml2-2.dll"
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
SYSTEM_LIBXML=NO SYSTEM_LIBXML=NO
BUILD_TYPE="$BUILD_TYPE LIBXML2 LIBXMLSEC" BUILD_TYPE="$BUILD_TYPE LIBXML2"
fi fi
AC_SUBST(SYSTEM_LIBXML) AC_SUBST(SYSTEM_LIBXML)
AC_SUBST(LIBXML_CFLAGS) AC_SUBST(LIBXML_CFLAGS)
@@ -5697,9 +5696,10 @@ fi
AC_MSG_CHECKING([whether to build XML Security support]) AC_MSG_CHECKING([whether to build XML Security support])
if test "$enable_xmlsec" = "no"; then if test "$enable_xmlsec" = "no"; then
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
ENABLE_XMLSEC=no ENABLE_XMLSEC=
else else
ENABLE_XMLSEC=yes ENABLE_XMLSEC="YES"
BUILD_TYPE="$BUILD_TYPE LIBXMLSEC"
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
fi fi
AC_SUBST(ENABLE_XMLSEC) AC_SUBST(ENABLE_XMLSEC)

2
libxmlsec/makefile.mk
View File

@@ -35,7 +35,7 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(ENABLE_XMLSEC)" == "NO" .IF "$(ENABLE_XMLSEC)" != "YES"
@all: @all:
@echo "XMLSec module disabled" @echo "XMLSec module disabled"
.ENDIF .ENDIF

2
xmlsecurity/Module_xmlsecurity.mk
View File

@@ -32,7 +32,7 @@ $(eval $(call gb_Module_add_targets,xmlsecurity,\
AllLangResTarget_xsec \ AllLangResTarget_xsec \
Library_xmlsecurity \ Library_xmlsecurity \
Library_xsec_fw \ Library_xsec_fw \
Library_xsec_xmlsec \ $(if $(filter YES,$(ENABLE_XMLSEC)),Library_xsec_xmlsec) \
)) ))
# failing # failing