diff options
| author | Allen Webb <allenwebb@google.com> | 2019-06-14 13:06:07 -0700 |
|---|---|---|
| committer | Mike Frysinger <vapier@chromium.org> | 2019-06-14 21:21:23 +0000 |
| commit | 488566d2dd8566fa9c6893d5d2d43a854a3b10b6 (patch) | |
| tree | 5a5ee87d8e416e62174214357735928f9c1bf828 /configure.ac | |
| parent | Enable PE-only metadata dumping for 64bit (aka. PE32+ format) PEs files. (diff) | |
| download | breakpad-488566d2dd8566fa9c6893d5d2d43a854a3b10b6.tar.xz | |
configure.ac: Workaround gtest-config not being installed.
Upstream googletest is dropping autotools support and the cmake
installer does not provide gtest-config.
BUG=chromium:940320
TEST=FEATURES=test emerge-lakitu google-breakpad
Change-Id: Icd51ffc48b39c24eebc27cc023e74a77e592de3e
Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/1660893
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 9cca5aa0..492d0903 100644 --- a/configure.ac +++ b/configure.ac @@ -187,19 +187,15 @@ AC_ARG_ENABLE(system-test-libs, [system_test_libs=false]) AM_CONDITIONAL(SYSTEM_TEST_LIBS, test x$system_test_libs = xtrue) -AC_ARG_VAR([GMOCK_CONFIG], [Path to gmock-config script]) AC_ARG_VAR([GMOCK_CFLAGS], [Compiler flags for gmock]) AC_ARG_VAR([GMOCK_LIBS], [Linker flags for gmock]) -AC_ARG_VAR([GTEST_CONFIG], [Path to gtest-config script]) AC_ARG_VAR([GTEST_CFLAGS], [Compiler flags for gtest]) AC_ARG_VAR([GTEST_LIBS], [Linker flags for gtest]) if test x$system_test_libs = xtrue; then - AC_CHECK_TOOL([GMOCK_CONFIG], [gmock-config]) - AC_CHECK_TOOL([GTEST_CONFIG], [gtest-config]) - GMOCK_CFLAGS=`$GMOCK_CONFIG --cppflags --cxxflags` - GMOCK_LIBS=`$GMOCK_CONFIG --ldflags --libs` - GTEST_CFLAGS=`$GTEST_CONFIG --cppflags --cxxflags` - GTEST_LIBS=`$GTEST_CONFIG --ldflags --libs` + : "${GMOCK_CFLAGS:=-pthread}" + : "${GMOCK_LIBS:=-lgmock -lgtest -pthread -lpthread}" + : "${GTEST_CFLAGS:=-pthread}" + : "${GTEST_LIBS:=-lgtest -pthread -lpthread}" fi AC_ARG_ENABLE(selftest, |