From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 15 Sep 2015 07:45:39 +0000 (+0000)
Subject: [Bug 2906] make check needs better support for pthreads.  Harlan Stenn.
X-Git-Tag: NTP_4_3_71~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46e386058e2e839f542551e6bad45432a169462e;p=thirdparty%2Fntp.git

[Bug 2906] make check needs better support for pthreads.  Harlan Stenn.

bk: 55f7cca3Mz0wb2Exup-yAvZy-Q3h0g
---

diff --git a/sntp/m4/ntp_libevent.m4 b/sntp/m4/ntp_libevent.m4
index 785b8e167..7795686b8 100644
--- a/sntp/m4/ntp_libevent.m4
+++ b/sntp/m4/ntp_libevent.m4
@@ -108,6 +108,13 @@ case "$ntp_use_local_libevent" in
 	    AC_MSG_RESULT([yes])
 	else
 	    ntp_use_local_libevent=yes
+	    # HMS: do we only need to do this if LIBISC_PTHREADS_NOTHREADS
+	    # is "pthreads"?
+	    CFLAGS_LIBEVENT=`$PKG_CONFIG --cflags libevent_pthreads`
+	    case "$CFLAGS_LIBEVENT" in
+	     '') CFLAGS_LIBEVENT="-pthreads"
+	     ;;
+	     esac
 	    AC_MSG_RESULT([no])
 	fi
 	;;
@@ -131,6 +138,22 @@ case "$ntp_use_local_libevent" in
     esac
 esac
 
+AC_ARG_ENABLE(
+    [cflags-libevent],
+    [AC_HELP_STRING(
+	[--enable-cflags-libevent=-pthread],
+	[CFLAGS value to build with pthreads]
+    )],
+    [CFLAGS_LIBEVENT=$enableval],
+    [# See above about LIBISC_PTHREADS_NOTHREADS
+    case "$CFLAGS_LIBEVENT" in
+     '') CFLAGS_LIBEVENT="-pthread" ;;
+     *) ;;
+    esac]
+)
+AC_MSG_NOTICE([LIBISC_PTHREADS_NOTHREADS is <$LIBISC_PTHREADS_NOTHREADS>])
+AC_MSG_NOTICE([CFLAGS_LIBEVENT is <$CFLAGS_LIBEVENT>])
+
 AM_CONDITIONAL([BUILD_LIBEVENT], [test "x$ntp_use_local_libevent" = "xyes"])
 
 ]) dnl NTP_LIBEVENT_CHECK_NOBUILD