diff options
| -rw-r--r-- | configure.in | 8 | ||||
| -rw-r--r-- | libxmlsec/makefile.mk | 2 | ||||
| -rw-r--r-- | xmlsecurity/Module_xmlsecurity.mk | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 392cd15241d3..808ec57731a3 100644 --- a/configure.in +++ b/configure.in @@ -4862,12 +4862,11 @@ if test -n "$with_system_libxml" -o -n "$with_system_libs" -o \ else PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.0) fi - BUILD_TYPE="$BUILD_TYPE LIBXMLSEC" MINGW_EXTERNAL_DLLS="$MINGW_EXTERNAL_DLLS zlib1.dll libxml2-2.dll" else AC_MSG_RESULT([internal]) SYSTEM_LIBXML=NO - BUILD_TYPE="$BUILD_TYPE LIBXML2 LIBXMLSEC" + BUILD_TYPE="$BUILD_TYPE LIBXML2" fi AC_SUBST(SYSTEM_LIBXML) AC_SUBST(LIBXML_CFLAGS) @@ -5697,9 +5696,10 @@ fi AC_MSG_CHECKING([whether to build XML Security support]) if test "$enable_xmlsec" = "no"; then AC_MSG_RESULT([no]) - ENABLE_XMLSEC=no + ENABLE_XMLSEC= else - ENABLE_XMLSEC=yes + ENABLE_XMLSEC="YES" + BUILD_TYPE="$BUILD_TYPE LIBXMLSEC" AC_MSG_RESULT([yes]) fi AC_SUBST(ENABLE_XMLSEC) diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index caefaadb74c9..84489f6ab419 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -35,7 +35,7 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE .INCLUDE : settings.mk -.IF "$(ENABLE_XMLSEC)" == "NO" +.IF "$(ENABLE_XMLSEC)" != "YES" @all: @echo "XMLSec module disabled" .ENDIF diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk index 2e6e8d9bb571..ea5f5aa42059 100644 --- a/xmlsecurity/Module_xmlsecurity.mk +++ b/xmlsecurity/Module_xmlsecurity.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Module_add_targets,xmlsecurity,\ AllLangResTarget_xsec \ Library_xmlsecurity \ Library_xsec_fw \ - Library_xsec_xmlsec \ + $(if $(filter YES,$(ENABLE_XMLSEC)),Library_xsec_xmlsec) \ )) # failing |