From: Francis Dupont <fdupont@isc.org>
Date: Sat, 15 Apr 2017 13:34:30 +0000 (+0200)
Subject: [4242] Addressed comments
X-Git-Tag: trac5187_base^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e66394bcc9f2fb69445191e172fbfdf5699a35b;p=thirdparty%2Fkea.git

[4242] Addressed comments
---

diff --git a/configure.ac b/configure.ac
index f2cac0311a..26d5c37190 100755
--- a/configure.ac
+++ b/configure.ac
@@ -152,7 +152,6 @@ AC_DEFUN([KEA_CXX_TRY_FLAG], [
 ])
 
 CXX_VERSION="unknown"
-CPPP="$CPP"
 
 # SunStudio compiler requires special compiler options for boost
 # (http://blogs.sun.com/sga/entry/boost_mini_howto)
@@ -190,6 +189,7 @@ if test "$CXX_DUMP_VERSION" \< "4.5"; then
        WARNING_GCC_44_STRICT_ALIASING_CFLAG="-fno-strict-aliasing"
 fi
 AC_SUBST(WARNING_GCC_44_STRICT_ALIASING_CFLAG)
+CPPP="$CPP"
 # gcc 5 preprocessor requires -P for checking its output
 if test "$CXX_DUMP_VERSION" \> "5"; then
        CPPP="$CPP -P"
diff --git a/m4macros/ax_boost_for_kea.m4 b/m4macros/ax_boost_for_kea.m4
index 7b45fdfa36..a2111c10ae 100644
--- a/m4macros/ax_boost_for_kea.m4
+++ b/m4macros/ax_boost_for_kea.m4
@@ -210,6 +210,7 @@ cat > conftest.cpp << EOF
 AUTOCONF_BOOST_LIB_VERSION=BOOST_LIB_VERSION
 EOF
 
+dnl CPPP is defined in configure to $CPP or $CPP -P
 BOOST_VERSION=`$CPPP $CPPFLAGS conftest.cpp | grep '^AUTOCONF_BOOST_LIB_VERSION=' | $SED -e 's/^AUTOCONF_BOOST_LIB_VERSION=//' -e 's/_/./g' -e 's/"//g' 2> /dev/null`
 if test -z "$BOOST_VERSION"; then
   BOOST_VERSION="unknown"