Clean up libevent configure checks

bk: 5a41c7cbG3CUKQG7vvolO52tNJpt8g

diff --git a/ChangeLog b/ChangeLog
index 7221197f5b2b66e535e954f82abc5589caea9eb8..25979eac3219a6fc77c37eaafdfbbeff4ef249ac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -63,6 +63,7 @@
 * sntp: pkt_output(): Improve debug output.  HStenn.
 * update-leap: updates from Paul McMath.
 * When using pkg-config, report --modversion.  HStenn.
+* Clean up libevent configure checks.  HStenn.
 
 ---
 (4.2.8p10) 2017/03/21 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/sntp/m4/ntp_libevent.m4 b/sntp/m4/ntp_libevent.m4
index 0a5691757e06f76d165f077a2d796cc9046d773a..14b614b465a339a01436f1248293ad55d6215737 100644 (file)
--- a/sntp/m4/ntp_libevent.m4
+++ b/sntp/m4/ntp_libevent.m4
@@ -78,7 +78,12 @@ case "$ntp_use_local_libevent" in
        if $PKG_CONFIG --atleast-version=$ntp_libevent_min_version libevent
        then
            ntp_use_local_libevent=no
-           AC_MSG_NOTICE([Using the installed libevent])
+           ntp_libevent_version="`$PKG_CONFIG --modversion libevent`"
+           case "$ntp_libevent_version" in
+            *.*) ;;
+            *) ntp_libevent_version='(unknown)' ;;
+           esac
+           AC_MSG_RESULT([yes, version $ntp_libevent_version])
            CFLAGS_LIBEVENT=`$PKG_CONFIG --cflags libevent_pthreads`
            CPPFLAGS_LIBEVENT=`$PKG_CONFIG --cflags-only-I libevent`
            # HMS: I hope the following is accurate.
@@ -106,12 +111,6 @@ case "$ntp_use_local_libevent" in
                LDADD_LIBEVENT="$LDADD_LIBEVENT -levent_pthreads"
            esac
            LDADD_LIBEVENT="$LDADD_LIBEVENT -levent_core"
-           ntp_libevent_version="`$PKG_CONFIG --modversion libevent`"
-           case "$ntp_libevent_version" in
-            *.*) ;;
-            *) ntp_libevent_version='(unknown)' ;;
-           esac
-           AC_MSG_RESULT([yes, version $ntp_libevent_version])
        else
            ntp_use_local_libevent=yes
            # HMS: do we only need to do this if LIBISC_PTHREADS_NOTHREADS