Don't define a variable inside a conditional block
authorDan Scott <dan@coffeecode.net>
Thu, 25 Aug 2011 15:41:19 +0000 (11:41 -0400)
committerDan Scott <dan@coffeecode.net>
Thu, 25 Aug 2011 15:41:19 +0000 (11:41 -0400)
./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@laurentian.ca>

configure.ac

index df978c6..ad2cadf 100644 (file)
@@ -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.
        #-----------------------------