commit e2aab94bd5284496c7ac0547d358c34ea8032220
author William A. Kennington III <wak@google.com> Wed Jan 24 16:56:41 2018 -0800
committer William A. Kennington III <wak@google.com> Mon Jan 29 12:00:03 2018 -0800
tree 39f21debe5189e177868b968fb0483dffd52208a
parent a55c72594c50e7372d6cad815e5ebba0d0f4817f

configure/make: Allow googletest from pkg-config

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

configure.ac

diff --git a/configure.ac b/configure.ac
index 49b300e..a911296 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,13 +20,17 @@
 
 # Check for needed modules
 PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 221], [], [AC_MSG_ERROR(["systemd required and not found"])])
-PKG_CHECK_MODULES([PHOSPHOR_LOGGING], [phosphor-logging],, [AC_MSG_ERROR([Could not find phosphor-logging...openbmc/phosphor-logging package required])])
+PKG_CHECK_MODULES([PHOSPHOR_LOGGING], [phosphor-logging], [], [AC_MSG_ERROR([Could not find phosphor-logging...openbmc/phosphor-logging package required])])
 PKG_CHECK_MODULES([SDBUSPLUS], [sdbusplus],, [AC_MSG_ERROR([Could not find sdbusplus...openbmc/sdbusplus package required])])
-PKG_CHECK_MODULES([PHOSPHOR_DBUS_INTERFACES], [phosphor-dbus-interfaces],, [AC_MSG_ERROR([Could not find phosphor-dbus-interfaces...openbmc/phosphor-dbus-interfaces package required])])
+PKG_CHECK_MODULES([PHOSPHOR_DBUS_INTERFACES], [phosphor-dbus-interfaces], [], [AC_MSG_ERROR([Could not find phosphor-dbus-interfaces...openbmc/phosphor-dbus-interfaces package required])])
+PKG_CHECK_MODULES([GTEST_MAIN], [gtest_main], [],
+    [
+        AX_PTHREAD([GTEST_MAIN_CFLAGS="-DGTEST_HAS_PTHREAD=1"],[GTEST_MAIN_CFLAGS="-DGTEST_HAS_PTHREAD=0"])
+        [GTEST_MAIN_LIBS="-lgtest_main -lgtest"]
+        AC_SUBST(GTEST_MAIN_CFLAGS)
+        AC_SUBST(GTEST_MAIN_LIBS)
+    ])
 
-# Check/set gtest specific functions.
-AX_PTHREAD([GTEST_CPPFLAGS="-DGTEST_HAS_PTHREAD=1"],[GTEST_CPPFLAGS="-DGTEST_HAS_PTHREAD=0"])
-AC_SUBST(GTEST_CPPFLAGS)
 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 259e357..173e0e2 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -7,21 +7,20 @@
 check_PROGRAMS = timer_test \
                  watchdog_test
 
-utestCPPFLAGS = -Igtest \
-                 $(GTEST_CPPFLAGS) \
-                 $(AM_CPPFLAGS) \
-                 $(SDBUSPLUS_CFLAGS) \
-                 $(PHOSPHOR_LOGGING_CFLAGS) \
-                 $(PHOSPHOR_DBUS_INTERFACES_CFLAGS)
+utestCPPFLAGS = $(GTEST_MAIN_CFLAGS) \
+                $(AM_CPPFLAGS) \
+                $(SDBUSPLUS_CFLAGS) \
+                $(PHOSPHOR_LOGGING_CFLAGS) \
+                $(PHOSPHOR_DBUS_INTERFACES_CFLAGS)
 
 utestCXXFLAGS = $(PTHREAD_CFLAGS)
 
-utestLDFLAGS = -lgtest_main -lgtest \
-                $(PTHREAD_LIBS) \
-                $(OESDK_TESTCASE_FLAGS) \
-                $(SDBUSPLUS_LIBS) \
-                $(PHOSPHOR_LOGGING_LIBS) \
-                $(PHOSPHOR_DBUS_INTERFACES_LIBS)
+utestLDFLAGS = $(GTEST_MAIN_LIBS) \
+               $(PTHREAD_LIBS) \
+               $(OESDK_TESTCASE_FLAGS) \
+               $(SDBUSPLUS_LIBS) \
+               $(PHOSPHOR_LOGGING_LIBS) \
+               $(PHOSPHOR_DBUS_INTERFACES_LIBS)
 
 timer_test_CPPFLAGS = ${utestCPPFLAGS}
 timer_test_CXXFLAGS = ${utestCXXFLAGS}