BIND 10 trac3107, updated. cc480a64481dbce14348038cfa254578fc51623b Use coding standards include syntax and add missing CPP flags to version checks

[BIND 10 source code commits]

The branch, trac3107 has been updated
       via  cc480a64481dbce14348038cfa254578fc51623b (commit)
       via  8d746f00a3e7014d78502b3744a426d54fc0e3ef (commit)
      from  fa1c3b6a4edfc169a86410ccf3b35263c6cb8d4a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit cc480a64481dbce14348038cfa254578fc51623b
Author: Kean Johnston <kean at isc.org>
Date:   Mon Sep 16 15:29:58 2013 +0200

    Use coding standards include syntax and add missing CPP flags to version checks

commit 8d746f00a3e7014d78502b3744a426d54fc0e3ef
Author: Kean Johnston <kean at isc.org>
Date:   Mon Sep 16 10:36:41 2013 +0200

    [3107] Added missing space for SunStudio CXX version detection

-----------------------------------------------------------------------

Summary of changes:
 configure.ac                      |    2 +-
 m4macros/ax_boost_for_bind10.m4   |    4 ++--
 m4macros/ax_sqlite3_for_bind10.m4 |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 47c70b5..903b38d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,7 +117,7 @@ AC_DEFUN([BIND10_CXX_TRY_FLAG], [
 # SunStudio compiler requires special compiler options for boost
 # (http://blogs.sun.com/sga/entry/boost_mini_howto)
 if test "$SUNCXX" = "yes"; then
-CXX_VERSION=`$CXX-V 2> /dev/null | head -1`
+CXX_VERSION=`$CXX -V 2> /dev/null | head -1`
 CXXFLAGS="$CXXFLAGS -library=stlport4 -features=tmplife -features=tmplrefstatic"
 MULTITHREADING_FLAG="-mt"
 fi
diff --git a/m4macros/ax_boost_for_bind10.m4 b/m4macros/ax_boost_for_bind10.m4
index 7ef0b7e..e8a7add 100644
--- a/m4macros/ax_boost_for_bind10.m4
+++ b/m4macros/ax_boost_for_bind10.m4
@@ -188,11 +188,11 @@ AC_SUBST(BOOST_INCLUDES)
 dnl Determine the Boost version, used mainly for config.report.
 AC_MSG_CHECKING([Boost version])
 cat > conftest.cpp << EOF
-#include "boost/version.hpp"
+#include <boost/version.hpp>
 AUTOCONF_BOOST_LIB_VERSION=BOOST_LIB_VERSION
 EOF
 
-BOOST_VERSION=`$CPP conftest.cpp | grep '^AUTOCONF_BOOST_LIB_VERSION=' | $SED -e 's/^AUTOCONF_BOOST_LIB_VERSION=//' -e 's/_/./g' -e 's/"//g' 2> /dev/null`
+BOOST_VERSION=`$CPP $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"
 fi
diff --git a/m4macros/ax_sqlite3_for_bind10.m4 b/m4macros/ax_sqlite3_for_bind10.m4
index 2e9539b..476dcc7 100644
--- a/m4macros/ax_sqlite3_for_bind10.m4
+++ b/m4macros/ax_sqlite3_for_bind10.m4
@@ -19,11 +19,11 @@ CPPFLAGS_SAVED="$CPPFLAGS"
 CPPFLAGS="${CPPFLAGS} $SQLITE_CFLAGS"
 AC_MSG_CHECKING([SQLite version])
 cat > conftest.c << EOF
-#include "sqlite3.h"
+#include <sqlite3.h>
 AUTOCONF_SQLITE_VERSION=SQLITE_VERSION
 EOF
 
-SQLITE_VERSION=`$CPP conftest.c | grep '^AUTOCONF_SQLITE_VERSION=' | $SED -e 's/^AUTOCONF_SQLITE_VERSION=//' -e 's/"//g' 2> /dev/null`
+SQLITE_VERSION=`$CPP $CPPFLAGS conftest.c | grep '^AUTOCONF_SQLITE_VERSION=' | $SED -e 's/^AUTOCONF_SQLITE_VERSION=//' -e 's/"//g' 2> /dev/null`
 if test -z "$SQLITE_VERSION"; then
   SQLITE_VERSION="unknown"
 fi