From: Oliver Kurth <okurth@vmware.com>
Date: Wed, 20 Jun 2018 00:07:50 +0000 (-0700)
Subject: Build open-vm-tools with xmlsec1 by default.
X-Git-Tag: stable-11.0.0~540
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30e58e8a0a18fcf3013cd76889056c055966bd50;p=thirdparty%2Fopen-vm-tools.git

Build open-vm-tools with xmlsec1 by default.

Build open-vm-tools with xmlsec1 by default, rather than with
xml-security-c as is done currently.  This requires modifications
to configure.ac to change the default for use_xmlsec1, plus
modifications to bora-vmsoft/install/Source/tools-pkg.make to
initialize flags for xmlsec1 and xml2 now needed by the OVT build
that is done during tools builds.

Another change that surfaced during this was that the symbol that
configure checks for the xmlsec library was wrong.  It should be
xmlSecCheckVersionExt rather than xmlSecCheckVersion.  The latter
is a header-defined macro but not a library symbol.
---

diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
index 3aeb8bc33..338e0353f 100644
--- a/open-vm-tools/configure.ac
+++ b/open-vm-tools/configure.ac
@@ -509,27 +509,27 @@ AC_ARG_ENABLE([vgauth],
      [do not build vgauth.])],
    [
     enable_vgauth="$enableval"
-    use_xmlsec1=no
+    use_xmlsec1=yes
    ],
    [
     if test "$os" = "linux"; then
        enable_vgauth=yes
-       use_xmlsec1=no
+       use_xmlsec1=yes
     else
        enable_vgauth=no
-       use_xmlsec1=no
+       use_xmlsec1=yes
     fi
    ])
 
 AC_ARG_ENABLE([xmlsec1],
    [AS_HELP_STRING([--enable-xmlsec1],
-     [build vgauth with xmlsec1 instead of xml-security-c (off by default).])],
+     [build vgauth with xmlsec1 instead of xml-security-c (on by default).])],
    [use_xmlsec1="$enableval"],
-   [use_xmlsec1=no])
+   [use_xmlsec1=yes])
 
 AC_ARG_ENABLE([xmlsecurity],
    [AS_HELP_STRING([--enable-xmlsecurity],
-     [build vgauth with xml-security-c instead of xmlsec1 (on by default).])],
+     [build vgauth with xml-security-c instead of xmlsec1 (off by default).])],
    [
     if test "$enableval" = "yes"; then
        use_xmlsec1="no"
@@ -632,7 +632,7 @@ if test "$enable_vgauth" = "yes"; then
                        [xmlsec1-config],
                        [],
                        [xmlsec/xmlsec.h],
-                       [xmlSecCheckVersion],
+                       [xmlSecCheckVersionExt],
                        [XMLSEC1_CPPFLAGS="$XMLSEC1_CPPFLAGS -DXMLSEC_NO_SIZE_T"],
                        [AC_VMW_LIB_ERROR([XMLSEC1], [xmlsec1])])