From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 26 Nov 2015 06:10:45 +0000 (-0800)
Subject: Libevent autoconf pthread fixes for FreeBSD-10.  Harlan Stenn.
X-Git-Tag: NTP_4_3_84~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5b3be20690f78a4b02d0e683b9303364077123c;p=thirdparty%2Fntp.git

Libevent autoconf pthread fixes for FreeBSD-10.  Harlan Stenn.

bk: 5656a265oOO9h_OoPADpE_0QSv5nOg
---

diff --git a/ChangeLog b/ChangeLog
index 254284f0d..a787d4306 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,7 @@
               lots of clients. perlinger@ntp.org
 * Unity cleanup for FreeBSD-6.4.  Harlan Stenn.
 * Unity test cleanup.  Harlan Stenn.
+* Libevent autoconf pthread fixes for FreeBSD-10.  Harlan Stenn.
 ---
 (4.2.8p4) 2015/10/21 Released by Harlan Stenn <stenn@ntp.org>
 (4.2.8p4-RC1) 2015/10/06 Released by Harlan Stenn <stenn@ntp.org>
diff --git a/sntp/m4/ntp_libevent.m4 b/sntp/m4/ntp_libevent.m4
index 895360ee7..a465d9bba 100644
--- a/sntp/m4/ntp_libevent.m4
+++ b/sntp/m4/ntp_libevent.m4
@@ -89,9 +89,10 @@ case "$ntp_use_local_libevent" in
 	    # LDADD_LIBEVENT=`$PKG_CONFIG --libs libevent | sed 's:-levent::'`
 	    # So now we dance...
 	    LDADD_LIBEVENT=
-	    for i in `$PKG_CONFIG --libs libevent`
+	    for i in `$PKG_CONFIG --libs libevent` `$PKG_CONFIG --cflags-only-other libevent_pthreads`
 	    do
 		case "$i" in
+		 -D*) ;;
 		 -levent*) ;;
 		 *) case "$LDADD_LIBEVENT" in
 		     '') LDADD_LIBEVENT="$i" ;;