svn commit: r1506494 - in /subversion/trunk: build.conf configure.ac

[ph...@apache.org]

Author: philip
Date: Wed Jul 24 11:02:20 2013
New Revision: 1506494

URL: http://svn.apache.org/r1506494
Log:
Tweak the cxxhl/Googlemock build.

* build.conf
  (cxxhl-test): Add apr to libs.

* configure.ac
  (gmock): Make behaviour match help text, i.e. enabled by default
   with --disable-gmock to disable.

Modified:
    subversion/trunk/build.conf
    subversion/trunk/configure.ac

Modified: subversion/trunk/build.conf
URL: http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1506494&r1=1506493&r2=1506494&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Wed Jul 24 11:02:20 2013
@@ -679,7 +679,7 @@ description = Unit tests for Subversion 
 when = SVN_USE_GMOCK
 type = exe
 path = subversion/bindings/cxxhl
-libs = libsvncxxhl libgmock libsvn_subr
+libs = libsvncxxhl libgmock libsvn_subr apr
 sources = tests/*.cpp
 install = tests
 compile-cmd = $(COMPILE_CXXHL_GMOCK_CXX)

Modified: subversion/trunk/configure.ac
URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1506494&r1=1506493&r2=1506494&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Wed Jul 24 11:02:20 2013
@@ -632,8 +632,8 @@ dnl Googlemock -----------------
 AC_ARG_ENABLE([gmock],
   AS_HELP_STRING([--disable-gmock],
                  [Do not use the Googlemock testing framework]),
-  [enable_gmock=yes],
-  [enable_gmock="$withval"])
+  [],
+  [enable_gmock=yes])
 
 AC_SUBST([GMOCK_SRCDIR], [$abs_srcdir/gmock-fused])
 AC_MSG_CHECKING([whether use Googlemock])