diff options
| author | Carl C. Trieloff <cctrieloff@apache.org> | 2008-10-16 02:07:02 +0000 |
|---|---|---|
| committer | Carl C. Trieloff <cctrieloff@apache.org> | 2008-10-16 02:07:02 +0000 |
| commit | 867195e7fc4b5c03038cb16eaab7efd5156071e9 (patch) | |
| tree | 4962db5f969ec3a1054063f3a93173a091e20aeb /cpp | |
| parent | 708790b9914b97404974860f0b801b720dd7a0ec (diff) | |
| download | qpid-python-867195e7fc4b5c03038cb16eaab7efd5156071e9.tar.gz | |
enable build without xml installed
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@705120 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/examples/Makefile.am | 4 | ||||
| -rwxr-xr-x | cpp/examples/verify_all | 5 | ||||
| -rw-r--r-- | cpp/src/Makefile.am | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/cpp/examples/Makefile.am b/cpp/examples/Makefile.am index 57ad22ec78..f5654790e6 100644 --- a/cpp/examples/Makefile.am +++ b/cpp/examples/Makefile.am @@ -1,9 +1,11 @@ SUBDIRS = direct fanout pub-sub request-response failover if HAVE_XML SUBDIRS += xml-exchange + broker_args = "--no-module-dir --data-dir \"\" --auth no --load-module $(top_builddir)/src/.libs/xml.so" endif if !HAVE_XML exclude_examples_regexp="xml" # Exclude XML examples. + broker_args = "--no-module-dir --data-dir \"\" --auth no" endif MAKEDIST=.libs/Makefile @@ -25,5 +27,5 @@ abs_top_srcdir = @abs_top_srcdir@ # Verify the examples in the buid tree. check-local: - $(srcdir)/verify_all $(abs_top_srcdir)/.. $(top_builddir)/src/qpidd $(exclude_examples_regexp) + $(srcdir)/verify_all $(abs_top_srcdir)/.. $(top_builddir)/src/qpidd $(broker_args) $(exclude_examples_regexp) diff --git a/cpp/examples/verify_all b/cpp/examples/verify_all index 9b09fee0df..51380ad992 100755 --- a/cpp/examples/verify_all +++ b/cpp/examples/verify_all @@ -5,11 +5,12 @@ verify=`dirname $0`/verify topsrcdir=$1 qpidd=$2 -exclude_regexp=$3 +broker_args=$3 +exclude_regexp=$4 python=${QPID_PYTHON_DIR:-$topsrcdir/python} trap "$qpidd -q" exit -QPID_PORT=`$qpidd -dp0 --no-module-dir --data-dir "" --auth no --load-module $topsrcdir/cpp/src/.libs/xml.so` || { echo "Can't run qpidd" ; exit 1; } +QPID_PORT=`$qpidd -dp0 $broker_args` || { echo "Can't run qpidd" ; exit 1; } PYTHON_EXAMPLES=$python/examples PYTHONPATH=$python:$PYTHONPATH export QPID_PORT PYTHON_EXAMPLES PYTHONPATH diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am index 699af084fc..c63b98b18d 100644 --- a/cpp/src/Makefile.am +++ b/cpp/src/Makefile.am @@ -117,7 +117,9 @@ cmodule_LTLIBRARIES = include cluster.mk include acl.mk include qmf.mk +if HAVE_XML include xml.mk +endif if RDMA |