From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Thu, 5 Mar 2015 15:49:05 +0000 (+0100)
Subject: Stringify preprocessor string
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~98^2~67^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F2315%2Fhead;p=thirdparty%2Fpdns.git

Stringify preprocessor string

When compiling with something like './configure
CXXFLAGS=-DPACKAGEVERSION="1.2.3"', we fail with
"../config.h:162:792: error: too many decimal points in number"

This happens because the string as defined in config.h
has embedded double quotes. Escape them.
---

diff --git a/pdns/version.cc b/pdns/version.cc
index df6fd75842..234ed96d67 100644
--- a/pdns/version.cc
+++ b/pdns/version.cc
@@ -115,7 +115,11 @@ void showBuildConfiguration()
   theL()<<Logger::Warning<<"Built-in PolarSSL: "<<POLARSSL_VERSION_STRING<<endl;
 #endif
 #ifdef PDNS_CONFIG_ARGS
-  theL()<<Logger::Warning<<"Configured with: "<<PDNS_CONFIG_ARGS<<endl;
+#define double_escape(s) #s
+#define escape_quotes(s) double_escape(s)
+  theL()<<Logger::Warning<<"Configured with: "<<escape_quotes(PDNS_CONFIG_ARGS)<<endl;
+#undef escape_quotes
+#undef double_escape
 #endif
 }