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

bk: 5656a265oOO9h_OoPADpE_0QSv5nOg

diff --git a/ChangeLog b/ChangeLog
index 254284f0ddc3e630cdecc11c397934386dfef03f..a787d4306b28c0d33452f9df3df4f4183874717b 100644 (file)
--- 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 895360ee7b7612f9e11242f36770497d1a04da03..a465d9bba4237e3bff8208a0f95eb70093171ed8 100644 (file)
--- 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" ;;