diff options
| author | Patrick Venture <venture@google.com> | 2018-10-29 18:54:16 -0700 |
|---|---|---|
| committer | Patrick Venture <venture@google.com> | 2018-10-29 18:54:16 -0700 |
| commit | 6b4fb2969cd0c853ff6aa7f9bdd3ddaa0081c204 (patch) | |
| tree | ee321a52145ac3f270a48d82076e71e630f57b83 | |
| parent | 076d14af2b3e29e48471ffb7fab632317da0fc21 (diff) | |
| download | sdbusplus-6b4fb2969cd0c853ff6aa7f9bdd3ddaa0081c204.tar.gz sdbusplus-6b4fb2969cd0c853ff6aa7f9bdd3ddaa0081c204.zip | |
build: set language to C++
Set the language in the build to C++.
Change-Id: I997d6a697bc6c98ab208518a81e66ac2aa7945c1
Signed-off-by: Patrick Venture <venture@google.com>
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 58df3e0..2c88b97 100644 --- a/configure.ac +++ b/configure.ac @@ -6,6 +6,7 @@ AC_CONFIG_MACRO_DIRS([m4]) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([subdir-objects -Wall -Werror foreign dist-xz]) AM_SILENT_RULES([yes]) +AC_LANG([C++]) # Make sure the default CFLAGS of `-O2 -g` don't override CODE_COVERAGE_CFLAGS # It is important that this comes before AC_PROG_C{C,XX}, as we are attempting @@ -89,7 +90,6 @@ AS_IF([test "x$enable_tests" != "xno"], [ AX_SAVE_FLAGS_WITH_PREFIX(OLD, [CPPFLAGS]) AX_APPEND_COMPILE_FLAGS([$GTEST_CFLAGS], [CPPFLAGS]) - AC_LANG_PUSH([C++]) AC_CHECK_HEADERS([gtest/gtest.h], [ AS_IF([test "x$GTEST_CFLAGS" = "x"], [ AS_IF([test "x$PTHREAD_CFLAGS" = "x"], [ @@ -104,18 +104,15 @@ AS_IF([test "x$enable_tests" != "xno"], [ AC_MSG_ERROR([Testing enabled but could not find gtest/gtest.h]) ]) ]) - AC_LANG_POP([C++]) AX_RESTORE_FLAGS_WITH_PREFIX(OLD, [CPPFLAGS]) AX_SAVE_FLAGS_WITH_PREFIX(OLD, [CPPFLAGS]) AX_APPEND_COMPILE_FLAGS([$GMOCK_CFLAGS], [CPPFLAGS]) - AC_LANG_PUSH([C++]) AC_CHECK_HEADERS([gmock/gmock.h], [], [ AS_IF([test "x$enable_tests" = "xyes"], [ AC_MSG_ERROR([Testing enabled but could not find gmock/gmock.h]) ]) ]) - AC_LANG_POP([C++]) AX_RESTORE_FLAGS_WITH_PREFIX(OLD, [CPPFLAGS]) AX_SAVE_FLAGS_WITH_PREFIX(OLD, [LDFLAGS]) |
