From: John Wolfe <jwolfe@vmware.com>
Date: Fri, 11 Dec 2020 05:05:49 +0000 (-0800)
Subject: Fix propagation of libtirpc flags into build of test source.
X-Git-Tag: stable-11.2.5~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa024778aa12e578e7d27b192a458fb497a644f6;p=thirdparty%2Fopen-vm-tools.git

Fix propagation of libtirpc flags into build of test source.

Starting with glibc 2.32, the Linux libc<n>-dev no longer provides
the /usr/include/rpc/rpc.h header.  The configure script will detect
the availability of the libtirpc package and use the rpc.h header
from /usr/include/tirpc/rpc/rpc.h.

This fix extends the necessary compilation and linking options to the
build of the open-vm-tools services test programs that utilize RPC.

Fixes: https://github.com/vmware/open-vm-tools/issues/468
Pull Request: https://github.com/vmware/open-vm-tools/pull/469
---

diff --git a/open-vm-tools/AUTHORS b/open-vm-tools/AUTHORS
index a1907a97b..c1c70c361 100644
--- a/open-vm-tools/AUTHORS
+++ b/open-vm-tools/AUTHORS
@@ -68,3 +68,5 @@ Thom Leggett    Propagate new gdk-pixbuf-xlib include location
 Alexey Shabalin Adding vmtools library dependency to deploypkg library.
                 - https://github.com/vmware/open-vm-tools/pull/432
 
+Christian Ehrhardt   Build: fix propagation of libtirpc flags
+                - https://github.com/vmware/open-vm-tools/pull/469
diff --git a/open-vm-tools/tests/testDebug/Makefile.am b/open-vm-tools/tests/testDebug/Makefile.am
index 575fa3bb9..5a35c1ccc 100644
--- a/open-vm-tools/tests/testDebug/Makefile.am
+++ b/open-vm-tools/tests/testDebug/Makefile.am
@@ -1,5 +1,5 @@
 ################################################################################
-### Copyright (C) 2009-2016 VMware, Inc.  All rights reserved.
+### Copyright (c) 2009-2016, 2020 VMware, Inc.  All rights reserved.
 ###
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of version 2 of the GNU General Public License as
@@ -22,6 +22,7 @@ libtestDebug_la_CPPFLAGS =
 libtestDebug_la_CPPFLAGS += @CUNIT_CPPFLAGS@
 libtestDebug_la_CPPFLAGS += @GOBJECT_CPPFLAGS@
 libtestDebug_la_CPPFLAGS += @PLUGIN_CPPFLAGS@
+libtestDebug_la_CPPFLAGS += @XDR_CPPFLAGS@
 
 libtestDebug_la_LDFLAGS =
 libtestDebug_la_LDFLAGS += @PLUGIN_LDFLAGS@
@@ -30,6 +31,7 @@ libtestDebug_la_LIBADD =
 libtestDebug_la_LIBADD += @CUNIT_LIBS@
 libtestDebug_la_LIBADD += @GOBJECT_LIBS@
 libtestDebug_la_LIBADD += @VMTOOLS_LIBS@
+libtestDebug_la_LIBADD += @XDR_LIBS@
 libtestDebug_la_LIBADD += ../vmrpcdbg/libvmrpcdbg.la
 
 libtestDebug_la_SOURCES =
diff --git a/open-vm-tools/tests/testPlugin/Makefile.am b/open-vm-tools/tests/testPlugin/Makefile.am
index e1951ecfd..5320cbcbd 100644
--- a/open-vm-tools/tests/testPlugin/Makefile.am
+++ b/open-vm-tools/tests/testPlugin/Makefile.am
@@ -1,5 +1,5 @@
 ################################################################################
-### Copyright (C) 2009-2016 VMware, Inc.  All rights reserved.
+### Copyright (c) 2009-2016, 2020 VMware, Inc.  All rights reserved.
 ###
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of version 2 of the GNU General Public License as
@@ -22,6 +22,7 @@ libtestPlugin_la_CPPFLAGS =
 libtestPlugin_la_CPPFLAGS += @CUNIT_CPPFLAGS@
 libtestPlugin_la_CPPFLAGS += @GOBJECT_CPPFLAGS@
 libtestPlugin_la_CPPFLAGS += @PLUGIN_CPPFLAGS@
+libtestPlugin_la_CPPFLAGS += @XDR_CPPFLAGS@
 
 libtestPlugin_la_LDFLAGS =
 libtestPlugin_la_LDFLAGS += @PLUGIN_LDFLAGS@
diff --git a/open-vm-tools/tests/vmrpcdbg/Makefile.am b/open-vm-tools/tests/vmrpcdbg/Makefile.am
index c28f4f38f..c7b278219 100644
--- a/open-vm-tools/tests/vmrpcdbg/Makefile.am
+++ b/open-vm-tools/tests/vmrpcdbg/Makefile.am
@@ -1,5 +1,5 @@
 ################################################################################
-### Copyright (C) 2009-2016 VMware, Inc.  All rights reserved.
+### Copyright (c) 2009-2016, 2020 VMware, Inc.  All rights reserved.
 ###
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of version 2 of the GNU General Public License as
@@ -21,6 +21,7 @@ libvmrpcdbg_la_CPPFLAGS =
 libvmrpcdbg_la_CPPFLAGS += @CUNIT_CPPFLAGS@
 libvmrpcdbg_la_CPPFLAGS += @GMODULE_CPPFLAGS@
 libvmrpcdbg_la_CPPFLAGS += @VMTOOLS_CPPFLAGS@
+libvmrpcdbg_la_CPPFLAGS += @XDR_CPPFLAGS@
 libvmrpcdbg_la_CPPFLAGS += -I$(top_srcdir)/lib/rpcChannel
 
 libvmrpcdbg_la_LDFLAGS =