Author: aconway Date: 2009-07-31 15:45:42 -0400 (Fri, 31 Jul 2009) New Revision: 3536 Modified: store/trunk/cpp/configure.ac store/trunk/cpp/tests/Makefile.am store/trunk/cpp/tests/cluster/Makefile.am store/trunk/cpp/tests/cluster/run_cluster_tests store/trunk/cpp/tests/run_python_tests store/trunk/cpp/tests/start_broker store/trunk/cpp/tests/stop_broker Log: Add --with-qpid-build to configure to allow building against a VPATH build of qpid. Modified: store/trunk/cpp/configure.ac =================================================================== --- store/trunk/cpp/configure.ac 2009-07-31 19:01:14 UTC (rev 3535) +++ store/trunk/cpp/configure.ac 2009-07-31 19:45:42 UTC (rev 3536) @@ -88,6 +88,10 @@ [AS_HELP_STRING([--with-qpid-checkout], [Location of qpid checkout to build against (by default use installed qpid)])]) +AC_ARG_WITH([qpid-build], + [AS_HELP_STRING([--with-qpid-build], + [Qpid build directory if different from --with-qpid-checkout])]) + AC_ARG_WITH([qpid-prefix], [AS_HELP_STRING([--with-qpid-prefix], [Location of installed qpid prefix to build against (by default "/")])], @@ -96,6 +100,7 @@ if test x$with_qpid_checkout != x; then QPID_DIR=$with_qpid_checkout + QPID_BLD=$QPID_DIR/cpp QPID_SRC=$QPID_DIR/cpp/src test -f $QPID_SRC/qpid/broker/MessageStore.h || \ AC_MSG_ERROR([$QPID_DIR does not appear to be a valid qpid checkout.]) @@ -116,8 +121,17 @@ QPID_CXXFLAGS="-I$QPID_INCLUDE" QPID_LIBS="-L$QPID_LIB -lqpidbroker" fi + +if test x$with_qpid_build != x; then + test x$with_qpid_checkout != x || AC_MSG_ERROR([--with-qpid-build requires --with-qpid-checkout]) + QPID_BLD=$with_qpid_build + QPID_LIBS="$QPID_BLD/src/libqpidbroker.la $QPID_BLD/src/libqpidcommon.la" + QPID_CXXFLAGS="-I$QPID_DIR/cpp/include -I$QPID_SRC -I$QPID_BLD/include -I$QPID_BLD/src" +fi + AC_SUBST([QPID_PREFIX]) AC_SUBST([QPID_DIR]) +AC_SUBST([QPID_BLD]) AC_SUBST([QPID_LIBS]) AC_SUBST([QPID_CXXFLAGS]) Modified: store/trunk/cpp/tests/Makefile.am =================================================================== --- store/trunk/cpp/tests/Makefile.am 2009-07-31 19:01:14 UTC (rev 3535) +++ store/trunk/cpp/tests/Makefile.am 2009-07-31 19:45:42 UTC (rev 3536) @@ -85,6 +85,7 @@ TESTS_ENVIRONMENT = \ QPID_DIR=$(QPID_DIR) \ + QPID_BLD=$(QPID_BLD) \ VALGRIND=$(VALGRIND) \ abs_srcdir=$(abs_srcdir) \ STORE_LIB=$(abs_builddir)/../lib/.libs/msgstore.so \ Modified: store/trunk/cpp/tests/cluster/Makefile.am =================================================================== --- store/trunk/cpp/tests/cluster/Makefile.am 2009-07-31 19:01:14 UTC (rev 3535) +++ store/trunk/cpp/tests/cluster/Makefile.am 2009-07-31 19:45:42 UTC (rev 3536) @@ -29,8 +29,6 @@ TMP_DATA_DIR=$(abs_srcdir)/../tmp_data_dir -QPID_TEST_DIR = $(QPID_DIR)/cpp/src/tests - all-local: .valgrindrc .valgrind.supp .valgrindrc: $(top_srcdir)/tests/.valgrindrc cp $^ . @@ -45,6 +43,7 @@ BOOST_TEST_SHOW_PROGRESS=yes \ STORE_ENABLE=1 \ QPID_DIR=$(QPID_DIR) \ + QPID_BLD=$(QPID_BLD) \ VALGRIND=$(VALGRIND) \ STORE_LIB=$(abs_builddir)/../../lib/.libs/msgstore.so \ TMP_DATA_DIR=$(TMP_DATA_DIR) \ Modified: store/trunk/cpp/tests/cluster/run_cluster_tests =================================================================== --- store/trunk/cpp/tests/cluster/run_cluster_tests 2009-07-31 19:01:14 UTC (rev 3535) +++ store/trunk/cpp/tests/cluster/run_cluster_tests 2009-07-31 19:45:42 UTC (rev 3536) @@ -124,24 +124,26 @@ exit 0; # A warning, not a failure. fi -# QPID_DIR is defined for source tree builds because of the --with-qpid-checkout config parameter +# QPID_DIR is defined for source tree builds by the --with-qpid-checkout configure option. +# QPID_BLD is defined as the build directory, either $QPID_DIR/cpp or separately +# specified with the --with-qpid-build option for VPATH builds. # If set, then set all the env vars from the correct places in the svn source tree. if test "${QPID_DIR}" -a -d "${QPID_DIR}" ; then # Paths and dirs export PYTHONPATH="${QPID_DIR}/python":"${abs_srcdir}" # Libraries - export CLUSTER_LIB="${QPID_DIR}/cpp/src/.libs/cluster.so" - export TEST_STORE_LIB="${QPID_DIR}/cpp/src/tests/.libs/test_store.so" + export CLUSTER_LIB="${QPID_BLD}/src/.libs/cluster.so" + export TEST_STORE_LIB="${QPID_BLD}/src/tests/.libs/test_store.so" # Executables - CPP_CLUSTER_EXEC="${QPID_DIR}/cpp/src/tests/cluster_test" - PYTHON_CLUSTER_EXEC="${QPID_DIR}/cpp/src/tests/$PYTHON_TESTNAME" - export QPIDD_EXEC="${QPID_DIR}/cpp/src/qpidd" + CPP_CLUSTER_EXEC="${QPID_BLD}/src/tests/cluster_test" + PYTHON_CLUSTER_EXEC="${QPID_BLD}/src/tests/$PYTHON_TESTNAME" + export QPIDD_EXEC="${QPID_BLD}/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" + export RECEIVER_EXEC="${QPID_BLD}/src/tests/receiver" + export SENDER_EXEC="${QPID_BLD}/src/tests/sender" else if test "${QPID_PREFIX}" -a -d "${QPID_PREFIX}" ; then QPID_BIN_DIR=$QPID_PREFIX/bin Modified: store/trunk/cpp/tests/run_python_tests =================================================================== --- store/trunk/cpp/tests/run_python_tests 2009-07-31 19:01:14 UTC (rev 3535) +++ store/trunk/cpp/tests/run_python_tests 2009-07-31 19:45:42 UTC (rev 3536) @@ -72,7 +72,7 @@ mkdir -p ${STORE_DIR} if test -z ${QPIDD} ; then - export QPIDD=${QPID_DIR}/cpp/src/qpidd + export QPIDD=${QPID_BLD}/src/qpidd fi fail=0 Modified: store/trunk/cpp/tests/start_broker =================================================================== --- store/trunk/cpp/tests/start_broker 2009-07-31 19:01:14 UTC (rev 3535) +++ store/trunk/cpp/tests/start_broker 2009-07-31 19:45:42 UTC (rev 3536) @@ -21,7 +21,7 @@ # # The GNU Lesser General Public License is available in the file COPYING. -QPIDD=$QPID_DIR/cpp/src/qpidd +QPIDD=$QPID_BLD/src/qpidd rm -f qpidd.vglog* qpidd.log test -n "$VALGRIND" && VALGRIND="$VALGRIND --log-file=qpidd.vglog --" exec libtool --mode=execute $VALGRIND $QPIDD --daemon --port=0 --log-enable error+ --log-to-file qpidd.log "$@" > qpidd.port Modified: store/trunk/cpp/tests/stop_broker =================================================================== --- store/trunk/cpp/tests/stop_broker 2009-07-31 19:01:14 UTC (rev 3535) +++ store/trunk/cpp/tests/stop_broker 2009-07-31 19:45:42 UTC (rev 3536) @@ -25,7 +25,7 @@ # if test -f qpidd.port; then export QPID_PORT=`cat qpidd.port` - QPIDD=$QPID_DIR/cpp/src/qpidd + QPIDD=$QPID_BLD/src/qpidd rm -f qpidd.port $QPIDD --quit || ERROR=$?