[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 785b8e167b8e340a47047e4706a2e4ecb8b1c430..7795686b8bf55c065ff12e266be1f796ec2dc3a9 100644 (file)
--- 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