commit b4b3247afc020843ebea278bf3c4e1cbebc54968
author William A. Kennington III <wak@google.com> Thu Jun 21 16:38:47 2018 -0700
committer William A. Kennington III <wak@google.com> Wed Jun 27 10:11:38 2018 -0700
tree 3f11f89b7b6d9313da7dd6bc3eb851811447e64e
parent b5645509cad3f6a3c5c869a69e6c25f17a7ea830

configure: Make gtest detection more flexible

This modifies the configure script to pull the googletest information
from pkgconfig. Now we don't have to manually configure GTEST specific
flags, we gain the correct library and header paths automatically. It
still understands how to detect googletest without pkgconfig if needed.

Change-Id: I7add3ee3073252adac7199415154c6805221e362
Signed-off-by: William A. Kennington III <wak@google.com>

configure.ac

diff --git a/configure.ac b/configure.ac
index 6ef46d9..c3d8554 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,9 +64,56 @@
 # Checks for library functions.
 LT_INIT # Removes 'unrecognized options: --with-libtool-sysroot'
 
+# Make it possible for users to choose if they want test support
+# explicitly or not at all
+AC_ARG_ENABLE([tests], [Whether we should build test cases])
+
+# Legacy tests require pthread support
+AS_IF([test "x$enable_tests" != "xno"], [
+    AX_PTHREAD([], [
+        AS_IF([test "x$enable_tests" != "xyes"], [
+            AC_MSG_ERROR([Testing enabled but could not find pthreads])
+        ])
+    ])
+])
+
 # Check/set gtest specific functions.
-AX_PTHREAD([GTEST_CPPFLAGS="-DGTEST_HAS_PTHREAD=1"],[GTEST_CPPFLAGS="-DGTEST_HAS_PTHREAD=0"])
-AC_SUBST(GTEST_CPPFLAGS)
+AS_IF([test "x$enable_tests" != "xno"], [
+    PKG_CHECK_MODULES([GTEST], [gtest])
+
+    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"], [
+                AX_APPEND_COMPILE_FLAGS(["-DGTEST_HAS_PTHREAD=0"], [GTEST_CFLAGS])
+            ], [
+                AX_APPEND_COMPILE_FLAGS(["-DGTEST_HAS_PTHREAD=1"], [GTEST_CFLAGS])
+                AX_APPEND_COMPILE_FLAGS([$PTHREAD_CFLAGS], [GTEST_CFLAGS])
+            ])
+        ])
+    ], [
+        AS_IF([test "x$enable_tests" = "xyes"], [
+            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, [LDFLAGS])
+    AX_APPEND_COMPILE_FLAGS([$GTEST_LIBS], [LDFLAGS])
+    AC_CHECK_LIB([gtest], [main], [
+        AS_IF([test "x$GTEST_LIBS" = "x"], [
+            AX_APPEND_COMPILE_FLAGS([-lgtest], [GTEST_LIBS])
+        ])
+    ], [
+        AS_IF([test "x$enable_tests" = "xyes"], [
+            AC_MSG_ERROR([Testing enabled but couldn't find gtest libs])
+        ])
+    ])
+    AX_RESTORE_FLAGS_WITH_PREFIX(OLD, [LDFLAGS])
+])
 
 AC_ARG_ENABLE([oe-sdk],
     AS_HELP_STRING([--enable-oe-sdk], [Link testcases absolutely against OE SDK so they can be ran within it.])

test/Makefile.am

diff --git a/test/Makefile.am b/test/Makefile.am
index ab0ec78..d4d41e4 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,7 +1,7 @@
 if WANT_LIBSDBUSPLUS
 
-AM_CPPFLAGS = -I$(top_srcdir) $(GTEST_CPPFLAGS)
-gtest_ldadd = -lgtest -lgtest_main $(OESDK_TESTCASE_FLAGS) $(PTHREAD_LIBS)
+AM_CPPFLAGS = -I$(top_srcdir) $(GTEST_CFLAGS)
+gtest_ldadd = $(GTEST_LIBS) -lgtest_main $(OESDK_TESTCASE_FLAGS) $(PTHREAD_LIBS)
 check_PROGRAMS =
 
 TESTS = $(check_PROGRAMS)