From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 25 Dec 2017 12:53:42 +0000 (-0800)
Subject: When using pkg-config, report --modversion
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdf74a6f3b02f045a57469e5b64f9ab53230a5dd;p=thirdparty%2Fntp.git

When using pkg-config, report --modversion

bk: 5a40f4d6iRliwgrG6o8Ezn1J5YiGXQ
---

diff --git a/ChangeLog b/ChangeLog
index 96dea87d2..7221197f5 100644
--- 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 69325efe7..12eeb129a 100644
--- 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 33554f38b..999676fa7 100644
--- 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