Merge lp:~chasedouglas/xorg-gtest/configure-error into lp:~oif-team/xorg-gtest/trunk

[Chase Douglas]

Fix configure so it errors when gtest is not available. Two other minor fixes.

[lp:~chasedouglas/xorg-gtest/configure-error]

6. By Chase Douglas on 2011-12-14

Move check result test to configure.ac and use standard variables

[Stephen M. Webb (bregma)]

AC_LANG_CPLUPLUS shouldn't appear in a defined macro like that. Use AC_LANG_PUSH(C++)/AC_LANG_POP instead. Just in case someone copies the .m4 file (and they're likely to at this point).

Other than that this is right.

review: Needs Fixing

[lp:~chasedouglas/xorg-gtest/configure-error]

7. By Chase Douglas on 2011-12-14

Link against pthread when checking for gtest library

8. By Chase Douglas on 2011-12-14

Use AC_LANG_PUSH(C++)/AC_LANG_POP so as not to contaminate configure.ac

[Chase Douglas (chasedouglas)]

Fixed the AC_LANG issue and hopefully fix an issue that Peter Hutterer was seeing with lpthreads not being linked in during the AC_CHECK_LIB test.

review: Needs Resubmitting

[Stephen M. Webb (bregma)]

Good.

review: Approve

[Thomas Voß (thomas-voss)]

Looks good to me.

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2011-12-06 00:25:36 +0000
+++ configure.ac	2011-12-14 01:34:23 +0000
@@ -31,7 +31,8 @@
 # Check for Google Test
 AC_CHECK_GTEST
 
-AM_CONDITIONAL([HAVE_GTEST], [test "x$have_gtest" = xyes])
+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])
 
=== modified file 'm4/gtest.m4'
--- m4/gtest.m4	2011-12-05 16:27:29 +0000
+++ m4/gtest.m4	2011-12-14 01:34:23 +0000
@@ -16,9 +16,15 @@
   [GTEST_LDFLAGS="-L$withval -lpthread"],
   [GTEST_LDFLAGS='-lgtest -lpthread'])
 
-  AC_HAVE_LIBRARY( [gtest], 
-                [have_gtest=yes], 
-                 AC_MSG_WARN([package 'gtest' not found: tests disabled]))
-
+  AC_LANG_PUSH(C++)
+
+  # We need to get to the 5th arg to link with -lpthread too. Mimic the default
+  # AC_CHECK_LIB action when found.
+  AC_CHECK_LIB([gtest], [main],
+               [AC_DEFINE(HAVE_LIBGTEST) LIBS="-lgtest $LIBS"],
+               [],
+               [-lpthread])
+
+  AC_LANG_POP
 ]) # AC_CHECK_GTEST