Browse Source

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

Kean Johnston 11 years ago
parent
commit
cc480a6448
2 changed files with 4 additions and 4 deletions
  1. 2 2
      m4macros/ax_boost_for_bind10.m4
  2. 2 2
      m4macros/ax_sqlite3_for_bind10.m4

+ 2 - 2
m4macros/ax_boost_for_bind10.m4

@@ -188,11 +188,11 @@ AC_SUBST(BOOST_INCLUDES)
 dnl Determine the Boost version, used mainly for config.report.
 dnl Determine the Boost version, used mainly for config.report.
 AC_MSG_CHECKING([Boost version])
 AC_MSG_CHECKING([Boost version])
 cat > conftest.cpp << EOF
 cat > conftest.cpp << EOF
-#include "boost/version.hpp"
+#include <boost/version.hpp>
 AUTOCONF_BOOST_LIB_VERSION=BOOST_LIB_VERSION
 AUTOCONF_BOOST_LIB_VERSION=BOOST_LIB_VERSION
 EOF
 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
 if test -z "$BOOST_VERSION"; then
   BOOST_VERSION="unknown"
   BOOST_VERSION="unknown"
 fi
 fi

+ 2 - 2
m4macros/ax_sqlite3_for_bind10.m4

@@ -19,11 +19,11 @@ CPPFLAGS_SAVED="$CPPFLAGS"
 CPPFLAGS="${CPPFLAGS} $SQLITE_CFLAGS"
 CPPFLAGS="${CPPFLAGS} $SQLITE_CFLAGS"
 AC_MSG_CHECKING([SQLite version])
 AC_MSG_CHECKING([SQLite version])
 cat > conftest.c << EOF
 cat > conftest.c << EOF
-#include "sqlite3.h"
+#include <sqlite3.h>
 AUTOCONF_SQLITE_VERSION=SQLITE_VERSION
 AUTOCONF_SQLITE_VERSION=SQLITE_VERSION
 EOF
 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
 if test -z "$SQLITE_VERSION"; then
   SQLITE_VERSION="unknown"
   SQLITE_VERSION="unknown"
 fi
 fi