mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-31 05:55:28 +00:00
Code Issues Releases Wiki Activity

[5088] Merged trac5092 diff

Browse Source
This commit is contained in:
Francis Dupont
2016-12-23 19:24:41 +01:00
parent f23ce81982
commit ca6f2af77b
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@@ -128,6 +128,14 @@ for retry in "none" "--std=c++11" "--std=c++0x" "--std=c++1x" "fail"; do
AC_MSG_WARN([unsupported C++11 feature]) AC_MSG_WARN([unsupported C++11 feature])
AC_MSG_NOTICE([retrying by adding $retry to $CXX]) AC_MSG_NOTICE([retrying by adding $retry to $CXX])
CXX="$CXX_SAVED $retry" CXX="$CXX_SAVED $retry"
AC_MSG_CHECKING($retry support)
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[],
[int myincr = 1;])],
[AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])
continue])
fi fi
AC_MSG_CHECKING(std::unique_ptr support) AC_MSG_CHECKING(std::unique_ptr support)
@@ -184,7 +192,7 @@ for retry in "none" "--std=c++11" "--std=c++0x" "--std=c++1x" "fail"; do
AC_COMPILE_IFELSE( AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM( [AC_LANG_PROGRAM(
[], [],
[auto incr = [[]](int x) { return x + 1; };])], [auto myincr = [[]](int x) { return x + 1; };])],
[AC_MSG_RESULT([yes]) [AC_MSG_RESULT([yes])
break], break],
[AC_MSG_RESULT([no]) [AC_MSG_RESULT([no])
@@ -1309,7 +1317,7 @@ if test "x$enable_gtest" = "xyes" ; then
[AC_MSG_ERROR([no gtest source at $GTEST_SOURCE])]) [AC_MSG_ERROR([no gtest source at $GTEST_SOURCE])])
fi fi
have_gtest_source=yes have_gtest_source=yes
GTEST_LDFLAGS="\$(top_builddir)/ext/gtest/libgtest.a" GTEST_LDADD="\$(top_builddir)/ext/gtest/libgtest.a"
DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest-source=$GTEST_SOURCE" DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest-source=$GTEST_SOURCE"
GTEST_INCLUDES="-I$GTEST_SOURCE -I$GTEST_SOURCE/include" GTEST_INCLUDES="-I$GTEST_SOURCE -I$GTEST_SOURCE/include"
fi fi