]> git.ipfire.org Git - thirdparty/open-vm-tools.git/commitdiff
Update the AC_VMW_CHECK_LIB fields for xmlsec1 library.
authorKruti Pendharkar <kp025370@broadcom.com>
Tue, 25 Feb 2025 09:29:11 +0000 (01:29 -0800)
committerKruti Pendharkar <kp025370@broadcom.com>
Tue, 25 Feb 2025 09:29:11 +0000 (01:29 -0800)
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

open-vm-tools/AUTHORS
open-vm-tools/configure.ac

index f8da85626f3469577f1ab9045e4d8282dcbc565c..a7ebb323ce0d6df77e35329c53c3dcfdbbd06067 100644 (file)
@@ -103,3 +103,6 @@ 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
index 4ad8178b0f0c71e2e456635eb425b9ef4d0a4dd2..81c6ac3e2621f48a375ae8e2e3ed0f34794924d4 100644 (file)
@@ -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-`"