31 lines
1.4 KiB
Text
31 lines
1.4 KiB
Text
--- configure.ac.orig 2016-10-14 17:11:57 UTC
|
|
+++ configure.ac
|
|
@@ -84,9 +84,7 @@ AC_CHECK_HEADER([gtest/gtest.h],, [missi
|
|
AS_VAR_APPEND([CPPFLAGS], [" -I$GMOCK_DIR/include"])
|
|
AC_CHECK_HEADER([gmock/gmock.h],, [missing_gmock=1])
|
|
AS_VAR_APPEND([CPPFLAGS], [" -I$GTEST_DIR"])
|
|
-AC_CHECK_HEADER([$GTEST_DIR/src/gtest-all.cc],, [missing_gtest=1])
|
|
AS_VAR_APPEND([CPPFLAGS], [" -I$GMOCK_DIR"])
|
|
-AC_CHECK_HEADER([$GMOCK_DIR/src/gmock-all.cc],, [missing_gmock=1])
|
|
CPPFLAGS="$saved_CPPFLAGS"
|
|
AS_IF([test -n "$missing_gtest"],
|
|
[AC_MSG_ERROR([could not find a working Google Test])])
|
|
@@ -106,7 +104,7 @@ AC_SEARCH_LIBS([clock_gettime], [rt],,,
|
|
|
|
AC_MSG_CHECKING([checking for gflags library])
|
|
LIBS="-lgflags $LIBS"
|
|
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <gflags/gflags.h>]], [[google::ParseCommandLineFlags(NULL, NULL, true)]])], [have_gflags=yes], [have_gflags=no])
|
|
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <gflags/gflags.h>]], [[gflags::ParseCommandLineFlags(NULL, NULL, true)]])], [have_gflags=yes], [have_gflags=no])
|
|
AC_MSG_RESULT([$have_gflags])
|
|
AS_IF([test "x$have_gflags" = "xno"],
|
|
[AC_MSG_ERROR([gflags library could not be found])])
|
|
@@ -118,6 +116,9 @@ AC_MSG_RESULT([$have_glog])
|
|
AS_IF([test "x$have_glog" = "xno"],
|
|
[AC_MSG_ERROR([glog library could not be found])])
|
|
|
|
+# Required for "make check" to build.
|
|
+LIBS="$LIBS -lgtest -lgmock"
|
|
+
|
|
save_LIBS="$LIBS"
|
|
AS_UNSET([LIBS])
|
|
AC_SEARCH_LIBS([snappy_compress], [snappy],,, [$save_LIBS])
|