Author: astitcher Date: 2009-07-30 16:43:52 -0400 (Thu, 30 Jul 2009) New Revision: 3532 Modified: store/trunk/cpp/configure.ac store/trunk/cpp/tests/cluster/run_cluster_tests Log: Modify configure so that you can supply an install prefix for qpid Modified: store/trunk/cpp/configure.ac =================================================================== --- store/trunk/cpp/configure.ac 2009-07-30 20:43:43 UTC (rev 3531) +++ store/trunk/cpp/configure.ac 2009-07-30 20:43:52 UTC (rev 3532) @@ -88,6 +88,12 @@ [AS_HELP_STRING([--with-qpid-checkout], [Location of qpid checkout to build against (by default use installed qpid)])]) +AC_ARG_WITH([qpid-prefix], + [AS_HELP_STRING([--with-qpid-prefix], + [Location of installed qpid prefix to build against (by default "/")])], + [], + [with_qpid_prefix="/"]) + if test x$with_qpid_checkout != x; then QPID_DIR=$with_qpid_checkout QPID_SRC=$QPID_DIR/cpp/src @@ -98,13 +104,19 @@ QPID_LIBS="$QPID_SRC/libqpidbroker.la $QPID_SRC/libqpidcommon.la" QPID_CXXFLAGS="-I$QPID_DIR/cpp/include -I$QPID_SRC" else + QPID_PREFIX=$with_qpid_prefix + QPID_INCLUDE=$QPID_PREFIX/include + QPID_LIB=$QPID_PREFIX/lib fail=0 - AC_CHECK_HEADERS([qpid/broker/MessageStore.h], , [fail=1]) + test -f $QPID_INCLUDE/qpid/broker/MessageStore.h || \ + fail=1 # Give any/all diagnostics before failing. test $fail = 1 && AC_MSG_ERROR([Missing required qpid libraries/headers. Install package qpidd-devel or use --with-qpid-checkout]) - QPID_LIBS="-lqpidbroker" -fi + QPID_CXXFLAGS="-I$QPID_INCLUDE" + QPID_LIBS="-L$QPID_LIB -lqpidbroker" +fi +AC_SUBST([QPID_PREFIX]) AC_SUBST([QPID_DIR]) AC_SUBST([QPID_LIBS]) AC_SUBST([QPID_CXXFLAGS]) Modified: store/trunk/cpp/tests/cluster/run_cluster_tests =================================================================== --- store/trunk/cpp/tests/cluster/run_cluster_tests 2009-07-30 20:43:43 UTC (rev 3531) +++ store/trunk/cpp/tests/cluster/run_cluster_tests 2009-07-30 20:43:52 UTC (rev 3532) @@ -96,7 +96,9 @@ # If this script is run using parameter $1 = "LONG_TEST", then run the long test scripts if test x$1 == x"LONG_TEST"; then echo "Running long tests..." - LONG_TEST=1 + PYTHON_TESTNAME="long_cluster_tests.py" +else + PYTHON_TESTNAME="cluster_tests.py" fi # Check AIS requirements and run tests if found. @@ -134,17 +136,19 @@ # Executables CPP_CLUSTER_EXEC="${QPID_DIR}/cpp/src/tests/cluster_test" - if test ${LONG_TEST}; then - PYTHON_CLUSTER_EXEC="${QPID_DIR}/cpp/src/tests/long_cluster_tests.py" - else - PYTHON_CLUSTER_EXEC="${QPID_DIR}/cpp/src/tests/cluster_tests.py" - fi + PYTHON_CLUSTER_EXEC="${QPID_DIR}/cpp/src/tests/$PYTHON_TESTNAME" export QPIDD_EXEC="${QPID_DIR}/cpp/src/qpidd" export QPID_CONFIG_EXEC="${QPID_DIR}/python/commands/qpid-config" export QPID_ROUTE_EXEC="${QPID_DIR}/python/commands/qpid-route" export RECEIVER_EXEC="${QPID_DIR}/cpp/src/tests/receiver" export SENDER_EXEC="${QPID_DIR}/cpp/src/tests/sender" else + if test "${QPID_PREFIX}" -a -d "${QPID_PREFIX}" ; then + QPID_BIN_DIR=$QPID_PREFIX/bin + QPID_SBIN_DIR=$QPID_PREFIX/sbin + QPID_LIB_DIR=$QPID_PREFIX/lib + QPID_LIBEXEC_DIR=$QPID_PREFIX/libexec + fi # These four env vars must be set prior to calling this script func_checkpaths QPID_BIN_DIR QPID_SBIN_DIR QPID_LIB_DIR QPID_LIBEXEC_DIR @@ -157,11 +161,7 @@ # Executables CPP_CLUSTER_EXEC="${QPID_LIBEXEC_DIR}/qpid/tests/cluster_test" - if test ${LONG_TEST}; then - PYTHON_CLUSTER_EXEC="${QPID_LIBEXEC_DIR}/qpid/tests/long_cluster_tests.py" - else - PYTHON_CLUSTER_EXEC="${QPID_LIBEXEC_DIR}/qpid/tests/cluster_tests.py" - fi + PYTHON_CLUSTER_EXEC="${QPID_LIBEXEC_DIR}/qpid/tests/$PYTHON_TESTNAME" export QPIDD_EXEC="${QPID_SBIN_DIR}/qpidd" export QPID_CONFIG_EXEC="${QPID_BIN_DIR}/qpid-config" export QPID_ROUTE_EXEC="${QPID_BIN_DIR}/qpid-route"