diff options
| author | Chase Douglas <chase.douglas@ubuntu.com> | 2011-12-13 17:02:48 -0800 |
|---|---|---|
| committer | Chase Douglas <chase.douglas@ubuntu.com> | 2011-12-13 17:02:48 -0800 |
| commit | 9b93e8df1f350fd1fc3cd0888c0bf565bf3e18f0 (patch) | |
| tree | acddc2408ba05a59eb15408077250848bd345b19 | |
| parent | 41d0b41fc5b244438af787de687a4b341889cadc (diff) | |
Move check result test to configure.ac and use standard variables
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | m4/gtest.m4 | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index b30cab0..b2cef93 100644 --- a/configure.ac +++ b/configure.ac @@ -31,6 +31,9 @@ PKG_CHECK_MODULES( XSERVER, x11 [xorg-server] ) # Check for Google Test AC_CHECK_GTEST +AS_IF([test "x$ac_cv_lib_gtest_main" != xyes], + AC_MSG_ERROR([package 'gtest' not found])) + AC_SUBST([GTEST_LDFLAGS]) AC_SUBST([GTEST_CXXFLAGS]) diff --git a/m4/gtest.m4 b/m4/gtest.m4 index 69b8867..760638a 100644 --- a/m4/gtest.m4 +++ b/m4/gtest.m4 @@ -18,8 +18,6 @@ AC_DEFUN([AC_CHECK_GTEST], AC_LANG_CPLUSPLUS - AC_CHECK_LIB([gtest], [main], [have_gtest=yes], - AC_MSG_ERROR([package 'gtest' not found])) - + AC_CHECK_LIB([gtest], [main]) ]) # AC_CHECK_GTEST |