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 | 671d409a756e0db33df5be46109c432c68a3ebd3 (patch) | |
| tree | ecc4fe49544538ee7c6ba276d4e8d3c5576557d3 /qpid/cpp/examples | |
| parent | f4c99f683a3ace8acd508af5147a03b123b857f4 (diff) | |
| download | qpid-python-671d409a756e0db33df5be46109c432c68a3ebd3.tar.gz | |
enable build without xml installed
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@705120 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/examples')
| -rw-r--r-- | qpid/cpp/examples/Makefile.am | 4 | ||||
| -rwxr-xr-x | qpid/cpp/examples/verify_all | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/qpid/cpp/examples/Makefile.am b/qpid/cpp/examples/Makefile.am index 57ad22ec78..f5654790e6 100644 --- a/qpid/cpp/examples/Makefile.am +++ b/qpid/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/qpid/cpp/examples/verify_all b/qpid/cpp/examples/verify_all index 9b09fee0df..51380ad992 100755 --- a/qpid/cpp/examples/verify_all +++ b/qpid/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 |