From: Oliver Kurth <okurth@vmware.com>
Date: Tue, 19 Jun 2018 18:07:45 +0000 (-0700)
Subject: open-vm-tools: build dndcp with thread libs
X-Git-Tag: stable-10.3.0~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2c8d02161569c96ac452f9d1063756d133562ba;p=thirdparty%2Fopen-vm-tools.git

open-vm-tools: build dndcp with thread libs

Recent changes in the dndcp plugin made it necessary to make sure that
it links against pthread libs.
---

diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
index dda65b7ff..72dc4ff1b 100644
--- a/open-vm-tools/configure.ac
+++ b/open-vm-tools/configure.ac
@@ -904,14 +904,14 @@ if test "$os" = "freebsd" -a "$osVersion" -ge 600000; then
    AC_CHECK_LIB(
       [thr],
       [pthread_mutex_init],
-      [THREAD_LIB=-lthr],
+      [THREAD_LIBS=-lthr],
       [AC_MSG_ERROR(
          [Unable to locate required threading library libthr.])])
 else
    AC_CHECK_LIB(
       [pthread],
       [pthread_mutex_init],
-      [THREAD_LIB=-lpthread],
+      [THREAD_LIBS=-lpthread],
       [AC_MSG_ERROR(
          [libpthread not found. Please install the libc/libpthread devel package(s).])])
 fi
@@ -1515,8 +1515,8 @@ if test "$HAVE_CRYPT" = "yes"; then
 fi
 
 
-LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD $THREAD_LIB"
-VIX_LIBADD="$VIX_LIBADD $THREAD_LIB"
+LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD $THREAD_LIBS"
+VIX_LIBADD="$VIX_LIBADD $THREAD_LIBS"
 
 ### Core Services definitions.
 
@@ -1565,6 +1565,7 @@ AC_SUBST([PLUGIN_CPPFLAGS])
 AC_SUBST([PLUGIN_LDFLAGS])
 AC_SUBST([VMTOOLS_CPPFLAGS])
 AC_SUBST([VMTOOLS_LIBS])
+AC_SUBST([THREAD_LIBS])
 AC_SUBST([RPCGENFLAGS])
 AC_SUBST([XDR_LIBS])
 AC_SUBST([XDR_CPPFLAGS])
diff --git a/open-vm-tools/services/plugins/dndcp/Makefile.am b/open-vm-tools/services/plugins/dndcp/Makefile.am
index 6ce87b2f2..8097fa61b 100644
--- a/open-vm-tools/services/plugins/dndcp/Makefile.am
+++ b/open-vm-tools/services/plugins/dndcp/Makefile.am
@@ -45,6 +45,7 @@ libdndcp_la_LIBADD += @GTK_LIBS@
 libdndcp_la_LIBADD += @GTKMM_LIBS@
 libdndcp_la_LIBADD += @VMTOOLS_LIBS@
 libdndcp_la_LIBADD += @HGFS_LIBS@
+libdndcp_la_LIBADD += @THREAD_LIBS@
 libdndcp_la_LIBADD += $(top_builddir)/lib/hgfsUri/hgfsUriPosix.lo
 libdndcp_la_LIBADD += @XDR_LIBS@