BIND 10 trac1999, updated. 794b0e2aa6cea30584b28b88ac760e49be678774 [trac1999] handle the gtest build from source for pthreads

BIND 10 source code commits bind10-changes at lists.isc.org
Wed Jul 11 23:06:24 UTC 2012


The branch, trac1999 has been updated
       via  794b0e2aa6cea30584b28b88ac760e49be678774 (commit)
      from  8fccdf262f5d23181ca5697ad4bdef35650768db (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 794b0e2aa6cea30584b28b88ac760e49be678774
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Wed Jul 11 18:04:19 2012 -0500

    [trac1999] handle the gtest build from source for pthreads
    
    When built from source it uses GTEST_HAS_PTHREAD.
    See $GTEST_SOURCE/include/gtest/internal/gtest-port.h
    which defines it for solaris, linux, hpux (which BIND 10 doesn't know yet).

-----------------------------------------------------------------------

Summary of changes:
 configure.ac |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index c35d22d..b9c525a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -827,13 +827,11 @@ GTEST_LDFLAGS=
 GTEST_LDADD=
 # TODO: set DISTCHECK_GTEST_CONFIGURE_FLAG for --with-gtest too
 DISTCHECK_GTEST_CONFIGURE_FLAG=
+
 if test "x$enable_gtest" = "xyes" ; then
 
 	if test -n "$with_gtest_source" ; then
 
-# TODO: actually need to check if needs pthread
-GTEST_LDADD="$GTEST_LDADD $PTHREAD_LDFLAGS"
-
           if test "x$GTEST_SOURCE" = "xyes" ; then
 
             AC_MSG_CHECKING([for gtest source])
@@ -859,6 +857,13 @@ GTEST_LDADD="$GTEST_LDADD $PTHREAD_LDFLAGS"
 	  GTEST_LDFLAGS="\$(top_builddir)/libgtest.a"
           DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest-source=$GTEST_SOURCE"
           GTEST_INCLUDES="-I$GTEST_SOURCE -I$GTEST_SOURCE/include"
+          # See $GTEST_SOURCE/include/gtest/internal/gtest-port.h
+          # about GTEST_HAS_PTHREAD.
+          case "$host" in
+            *-solaris*|*-linux*|*-hpux*)
+                GTEST_LDADD="$GTEST_LDADD $PTHREAD_LDFLAGS"
+                ;;
+          esac
         fi
 
   if test "$gtest_path" != "no" ; then



More information about the bind10-changes mailing list