]> git.ipfire.org Git - thirdparty/open-vm-tools.git/commitdiff
open-vm-tools: build dndcp with thread libs
authorOliver Kurth <okurth@vmware.com>
Tue, 19 Jun 2018 18:07:45 +0000 (11:07 -0700)
committerOliver Kurth <okurth@vmware.com>
Tue, 19 Jun 2018 18:07:45 +0000 (11:07 -0700)
Recent changes in the dndcp plugin made it necessary to make sure that
it links against pthread libs.

open-vm-tools/configure.ac
open-vm-tools/services/plugins/dndcp/Makefile.am

index dda65b7ffc44100affc241a0ea481638aa492f23..72dc4ff1be934d656be5d35ea2fbe77b37b0fce0 100644 (file)
@@ -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])
index 6ce87b2f2733782525f14605d0ea2c18d1dd05cc..8097fa61b5522cff04da85a324be36a7747a7eb9 100644 (file)
@@ -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@