From: Kees Monshouwer <mind04@monshouwer.org>
Date: Mon, 13 Oct 2014 23:12:28 +0000 (+0200)
Subject: report built-in PolarSSL version
X-Git-Tag: rec-3.7.0-rc1~189^2~12^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1818%2Fhead;p=thirdparty%2Fpdns.git

report built-in PolarSSL version
---

diff --git a/m4/pdns_with_system_polarssl.m4 b/m4/pdns_with_system_polarssl.m4
index 846ac7c2f5..2f612516c9 100644
--- a/m4/pdns_with_system_polarssl.m4
+++ b/m4/pdns_with_system_polarssl.m4
@@ -35,6 +35,7 @@ AC_DEFUN([PDNS_WITH_SYSTEM_POLARSSL],[
     POLARSSL_CFLAGS=
     POLARSSL_LIBS=-lpolarssl
     POLARSSL_SUBDIR=
+    AC_DEFINE([POLARSSL_SYSTEM], [1], [Defined if system PolarSSL is used])
     ],[
     AS_IF([test "x$with_system_polarssl" = "xyes"],[
       AC_MSG_ERROR([use of system polarssl requested but not found])]
diff --git a/pdns/version.cc b/pdns/version.cc
index 67bcf0d0ad..167eb3be62 100644
--- a/pdns/version.cc
+++ b/pdns/version.cc
@@ -23,6 +23,7 @@
 #include "logger.hh"
 #include "version.hh"
 #include "version_generated.h"
+#include <polarssl/version.h>
 
 static ProductType productType;
 
@@ -99,6 +100,9 @@ void showBuildConfiguration()
   // Auth only
   theL()<<Logger::Warning<<"Built-in modules: "<<PDNS_MODULES<<endl;
 #endif
+#ifndef POLARSSL_SYSTEM
+  theL()<<Logger::Warning<<"Built-in PolarSSL: "<<POLARSSL_VERSION_STRING<<endl;
+#endif
 }
 
 string fullVersionString()