When using pkg-config, report --modversion

bk: 5a40f4d6iRliwgrG6o8Ezn1J5YiGXQ

diff --git a/ChangeLog b/ChangeLog
index 96dea87d25935c4ef5fa2eb38eeba311083a25e1..7221197f5b2b66e535e954f82abc5589caea9eb8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -62,6 +62,7 @@
 * sntp: tweak key file logging.  HStenn.
 * sntp: pkt_output(): Improve debug output.  HStenn.
 * update-leap: updates from Paul McMath.
+* When using pkg-config, report --modversion.  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 69325efe7472346a1bfca2340b8a71a66879169d..12eeb129add4be1f603da4aa3d4394b021e60d53 100644 (file)
--- a/sntp/m4/ntp_libevent.m4
+++ b/sntp/m4/ntp_libevent.m4
@@ -106,7 +106,12 @@ case "$ntp_use_local_libevent" in
                LDADD_LIBEVENT="$LDADD_LIBEVENT -levent_pthreads"
            esac
            LDADD_LIBEVENT="$LDADD_LIBEVENT -levent_core"
-           AC_MSG_RESULT([yes])
+           ntp_libevent_version="`$PKG_CONFIG --modversion libevent`"
+           case "$ntp_libevent_version" in
+            *.*) ;;
+            *) ntp_libevent_version='(unknown)' ;;
+           esac
+           AC_MSG_RESULT([version $ntp_libevent_version])
        else
            ntp_use_local_libevent=yes
            # HMS: do we only need to do this if LIBISC_PTHREADS_NOTHREADS

diff --git a/sntp/m4/ntp_openssl.m4 b/sntp/m4/ntp_openssl.m4
index 33554f38b189a6ea3c105ded20f30fcc612229f4..999676fa7ebd70b746a9d2d66d415442b4cce435 100644 (file)
--- a/sntp/m4/ntp_openssl.m4
+++ b/sntp/m4/ntp_openssl.m4
@@ -85,7 +85,12 @@ case "$with_crypto:${PKG_CONFIG:+notempty}:${with_openssl_libdir-notgiven}:${wit
            VER_SUFFIX=o
            ntp_openssl=yes
            ntp_openssl_from_pkg_config=yes
-           AC_MSG_RESULT([yes])
+           ntp_openssl_version="`$PKG_CONFIG --modversion $pkg`"
+           case "$ntp_openssl_version" in
+            *.*) ;;
+            *) ntp_openssl_version='(unknown)' ;;
+           esac
+           AC_MSG_RESULT([version $ntp_openssl_version])
 
            break
        fi