report built-in PolarSSL version

diff --git a/m4/pdns_with_system_polarssl.m4 b/m4/pdns_with_system_polarssl.m4
index 846ac7c2f5166c58a6974d05712e8c1da063305b..2f612516c99dc99029b71cf3417015bda60d0e31 100644 (file)
--- 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 67bcf0d0adadf4c0d17f5f244092a6a467c0954b..167eb3be623f01e942de5fa913968a230e2d91c6 100644 (file)
--- 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()