From: bert hubert <bert.hubert@netherlabs.nl>
Date: Sun, 15 Feb 2015 18:55:44 +0000 (+0100)
Subject: fix up our c++2011-with-working-lua-detection (thanks to pieter for spotting the... 
X-Git-Tag: dnsdist-1.0.0-alpha1~300
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0fb57a80b764ce1e4e637d48f272f43eb05fb699;p=pdns

fix up our c++2011-with-working-lua-detection (thanks to pieter for spotting the issue)
---

diff --git a/configure.ac b/configure.ac
index f34cc6331..ed069d435 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,7 @@ AC_DEFINE([_GNU_SOURCE], [1],
   [Define _GNU_SOURCE so that we get all necessary prototypes]
 )
 
+PDNS_WITH_LUA
 AX_CXX_COMPILE_STDCXX_11(,optional)
 AM_CONDITIONAL([CXX2011],[test "$HAVE_CXX11" = "1"])
 AC_ARG_ENABLE([hardening], [
@@ -97,8 +98,6 @@ AC_CHECK_HEADERS(
 
 PDNS_CHECK_RAGEL
 
-PDNS_WITH_LUA
-
 BOOST_REQUIRE([1.35])
 BOOST_FOREACH
 BOOST_PROGRAM_OPTIONS([mt])
diff --git a/m4/ax_cxx_compile_stdcxx_11.m4 b/m4/ax_cxx_compile_stdcxx_11.m4
index 44f3c9a32..eafc71369 100644
--- a/m4/ax_cxx_compile_stdcxx_11.m4
+++ b/m4/ax_cxx_compile_stdcxx_11.m4
@@ -98,7 +98,7 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl
       AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
                      $cachevar,
         [ac_save_CXXFLAGS="$CXXFLAGS"
-         CXXFLAGS="$CXXFLAGS $switch"
+         CXXFLAGS="$LUA_CFLAGS $CXXFLAGS $switch"
          AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
           [eval $cachevar=yes],
           [eval $cachevar=no])
@@ -118,7 +118,7 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl
       AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
                      $cachevar,
         [ac_save_CXXFLAGS="$CXXFLAGS"
-         CXXFLAGS="$CXXFLAGS $switch"
+         CXXFLAGS="$CXXFLAGS $LUA_CFLAGS $switch"
          AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
           [eval $cachevar=yes],
           [eval $cachevar=no])