[OpenSRF-GIT] OpenSRF branch master updated. 0725d1ddced0f16c351a5953f5fd3c14714cda1a

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenSRF".

The branch, master has been updated
       via  0725d1ddced0f16c351a5953f5fd3c14714cda1a (commit)
      from  b24e90f1a1b1f2309ca3cdf0728cdd54f7822597 (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 0725d1ddced0f16c351a5953f5fd3c14714cda1a
Author: Dan Scott <dan at coffeecode.net>
Date:   Thu Aug 25 11:41:19 2011 -0400

    Don't define a variable inside a conditional block
    
    ./configure --disable-core --enable-javascript was dying with an error
    due to CHECK_TESTS not being defined; move it outside the conditional
    block so that we can ensure that it is defined as either yes or no.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/configure.ac b/configure.ac
index df978c6..ad2cadf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -273,6 +273,14 @@ if test x$OSRF_INSTALL_PYTHON = xtrue; then
         src/python/Makefile
     ])
 fi
+# Check Unit test framework
+PKG_CHECK_MODULES([CHECK], [check >= 0.9.0], [enable_tests=yes],
+                  [enable_tests=no])
+AM_CONDITIONAL(CHECK_TESTS, test x$enable_tests = xyes)
+
+if test "x$enable_tests" = "xno"; then
+  AC_MSG_WARN(Check unit testing framweork not found.)
+fi
 
 if test "x$OSRF_INSTALL_CORE" = "xtrue"; then
 	#--------------------------------
@@ -300,15 +308,6 @@ if test "x$OSRF_INSTALL_CORE" = "xtrue"; then
 	AC_SUBST(memcached_CFLAGS)
 	AC_SUBST(memcached_LIBS)
 
-    # Check Unit test framework
-    PKG_CHECK_MODULES([CHECK], [check >= 0.9.0], [enable_tests=yes],
-                      [enable_tests=no])
-    AM_CONDITIONAL(CHECK_TESTS, test x$enable_tests = xyes)
-
-    if test "x$enable_tests" = "xno"; then
-      AC_MSG_WARN(Check unit testing framwork not found.)
-    fi
-
 	#-----------------------------
 	# Checks for header files.
 	#-----------------------------

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

Summary of changes:
 configure.ac |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
OpenSRF