Author: cctrieloff
Date: Wed Oct 15 19:07:02 2008
New Revision: 705120
URL: http://svn.apache.org/viewvc?rev=705120&view=rev
Log:
enable build without xml installed
Modified:
incubator/qpid/trunk/qpid/cpp/examples/Makefile.am
incubator/qpid/trunk/qpid/cpp/examples/verify_all
incubator/qpid/trunk/qpid/cpp/src/Makefile.am
Modified: incubator/qpid/trunk/qpid/cpp/examples/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/Makefile.am?rev=705120&r1=705119&r2=705120&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/Makefile.am Wed Oct 15 19:07:02 2008
@@ -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 @@
# 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)
Modified: incubator/qpid/trunk/qpid/cpp/examples/verify_all
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/verify_all?rev=705120&r1=705119&r2=705120&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/verify_all (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/verify_all Wed Oct 15 19:07:02 2008
@@ -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
Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?rev=705120&r1=705119&r2=705120&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Wed Oct 15 19:07:02 2008
@@ -117,7 +117,9 @@
include cluster.mk
include acl.mk
include qmf.mk
+if HAVE_XML
include xml.mk
+endif
if RDMA
