From aa959233b54f9b28b15b3b35a43f4d03aa4322f0 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 20 Apr 2017 21:22:21 +0200 Subject: [PATCH] configure: link gtest with pthreads during check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit googletest on openSUSE uses threads, so… --- ac/gtest.m4 | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/ac/gtest.m4 b/ac/gtest.m4 index 76560bc16..cf86d2f7e 100644 --- a/ac/gtest.m4 +++ b/ac/gtest.m4 @@ -1,16 +1,13 @@ AC_DEFUN([AX_GTEST],[ - GTEST_TYPE=no + GTEST_TYPE=system - AC_LANG_PUSH(C++) CPPFLAGS_SAVED="$CPPFLAGS" + AC_LANG_PUSH(C++) - AC_CHECK_LIB(gtest_main,main) - AC_CHECK_HEADERS(gtest/gtest.h) + AC_CHECK_LIB([gtest_main],[main],[true],[GTEST_TYPE=no],[-lpthread]) + AC_CHECK_HEADERS([gtest/gtest.h],[true],[GTEST_TYPE=no]) - if test x$ac_cv_header_gtest_gtest_h = xyes && test x$ac_cv_lib_gtest_main_main = xyes; then - GTEST_TYPE=system - - elif test -d lib/gtest/include && test -d lib/gtest/src ; then + if test $GTEST_TYPE = no && test -d lib/gtest/include && test -d lib/gtest/src ; then AC_MSG_CHECKING(for internal gtest) AC_CACHE_VAL(ax_cv_gtest_internal,[ CPPFLAGS="$CPPFLAGS_SAVED -Ilib/gtest/include"