From: Kruti Pendharkar <kp025370@broadcom.com>
Date: Tue, 25 Feb 2025 01:42:24 +0000 (-0800)
Subject: Update the AC_VMW_CHECK_LIB fields for xmlsec1 library.
X-Git-Tag: stable-13.1.0~211
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7c196f802f171d15c74843ddfc7779ca0fdd7ae8;p=thirdparty%2Fopen-vm-tools.git

Update the AC_VMW_CHECK_LIB fields for xmlsec1 library.

Currently, the library's custom "config" (xmlsec1-config)
is being used to determine compiler and linker flags.
Customer reported cross compiler problem with the xmlsec1-config
usage and suggested the below changes to use pkg-config instead.

o Pass library name as 3rd parameter to AC_VMW_CHECK_LIB Macro
  to determine the compiler and linker flags via pkg-config.
o Also use the predefined 'PKG_CONFIG' variable rather than hardcoding
  'pkg-config'

Pull request: https://github.com/vmware/open-vm-tools/pull/732
---

diff --git a/open-vm-tools/AUTHORS b/open-vm-tools/AUTHORS
index 0a6587dcb..f521557cd 100644
--- a/open-vm-tools/AUTHORS
+++ b/open-vm-tools/AUTHORS
@@ -104,3 +104,5 @@ Brennan Kinney  Revise settings for vmware-user.desktop
 Rudy Heitbaum  Fix build when compiling with -std=c23
                 - https://github.com/vmware/open-vm-tools/pull/751
 
+James Le Cuirot  Fix xmlsec detection when cross-compiling with pkg-config
+                 - https://github.com/vmware/open-vm-tools/pull/732
diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
index cb78ef830..38b8f6c0e 100644
--- a/open-vm-tools/configure.ac
+++ b/open-vm-tools/configure.ac
@@ -1,5 +1,5 @@
 ################################################################################
-### Copyright (c) 2007-2024 Broadcom. All Rights Reserved.
+### Copyright (c) 2007-2025 Broadcom. All Rights Reserved.
 ### The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 ###
 ### Configure script for building the VMware OSS Tools.
@@ -879,12 +879,12 @@ if test "$enable_vgauth" = "yes" ; then
    AC_VMW_DEFAULT_FLAGS([XMLSEC1])
    AC_VMW_CHECK_LIB([xmlsec1],
                      [XMLSEC1],
-                     [],
+                     [xmlsec1],
                      [xmlsec1-config],
                      [],
                      [xmlsec/xmlsec.h],
                      [xmlSecCheckVersionExt],
-                     [XMLSEC1_VER=`pkg-config --modversion xmlsec1`
+                     [XMLSEC1_VER=`$PKG_CONFIG --modversion xmlsec1`
                       xmlsec1_major_version="`echo $XMLSEC1_VER | cut -f1 -d. | cut -f1 -d-`"
                       xmlsec1_minor_version="`echo $XMLSEC1_VER | cut -f2 -d. | cut -f1 -d-`"
                       xmlsec1_micro_version="`echo $XMLSEC1_VER | cut -f3 -d. | cut -f1 -d-`"