Merge pull request #1461 from rubenk/fix-java-plugin-on-freebsd

java: link with libpthread on FreeBSD

diff --git a/configure.ac b/configure.ac
index e86ae51..ce091ac 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2372,7 +2372,7 @@ then
        AC_CHECK_LIB(jvm, JNI_CreateJavaVM,
        [with_java="yes"],
        [with_java="no (Symbol 'JNI_CreateJavaVM' not found)"],
-       [$JAVA_LIBS])
+       [$JAVA_LIBS $PTHREAD_LIBS])
 fi
 if test "x$with_java" = "xyes"
 then

diff --git a/src/Makefile.am b/src/Makefile.am
index ff3eef4..b4f15ff 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -486,7 +486,7 @@ java_la_SOURCES = java.c
 java_la_CPPFLAGS = $(AM_CPPFLAGS) $(JAVA_CPPFLAGS)
 java_la_CFLAGS = $(AM_CFLAGS) $(JAVA_CFLAGS)
 java_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(JAVA_LDFLAGS)
-java_la_LIBADD = $(JAVA_LIBS)
+java_la_LIBADD = $(PTHREAD_LIBS) $(JAVA_LIBS)
 endif
 
 if BUILD_PLUGIN_LOAD