summaryrefslogtreecommitdiff
path: root/qpid/cpp
diff options
context:
space:
mode:
authorCarl C. Trieloff <cctrieloff@apache.org>2007-09-05 21:11:50 +0000
committerCarl C. Trieloff <cctrieloff@apache.org>2007-09-05 21:11:50 +0000
commit6568662b80f565abae8364ce63dbc1585d0d62d0 (patch)
treed5b6527dddd4dbf2acfbf0255a55eb01874170df /qpid/cpp
parent421549c444c6df2f56080b2ed836ddafb1a0bf07 (diff)
downloadqpid-python-6568662b80f565abae8364ce63dbc1585d0d62d0.tar.gz
applied Nuno's patch
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@573059 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
-rw-r--r--qpid/cpp/README2
-rw-r--r--qpid/cpp/configure.ac4
2 files changed, 5 insertions, 1 deletions
diff --git a/qpid/cpp/README b/qpid/cpp/README
index 35e3630502..4dc0b8f66c 100644
--- a/qpid/cpp/README
+++ b/qpid/cpp/README
@@ -60,7 +60,7 @@ all of the above plus:
On linux most packages can be installed using your distribution's package
management tool. For example on Fedora:
- # yum install pkgconfig e2fsprogs boost-devel cppunit-devel openais
+ # yum install pkgconfig e2fsprogs boost-devel cppunit-devel openais ruby
# yum install make gcc-c++ autoconf automake libtool doxygen help2man graphviz
Follow the manual installation instruction below for any packages not
diff --git a/qpid/cpp/configure.ac b/qpid/cpp/configure.ac
index 4ba175a71c..b07b06b1d4 100644
--- a/qpid/cpp/configure.ac
+++ b/qpid/cpp/configure.ac
@@ -117,6 +117,7 @@ AM_CONDITIONAL([HAS_RPMLINT], [test -n "$RPMLINT"])
AC_CHECK_PROG([RUBY], [ruby], [ruby])
test -n "$RUBY" && generate=yes
+test -z "$RUBY" && AC_MSG_ERROR([Missing ruby installation (try "yum install ruby").])
specdir=`pwd`/$srcdir/../specs
AMQP_XML=$specdir/amqp-transitional.0-10.xml
@@ -135,6 +136,9 @@ AC_SUBST(DOWNLOAD_URL)
AC_CHECK_HEADERS([boost/shared_ptr.hpp uuid/uuid.h],,
AC_MSG_ERROR([Missing required header files.]))
+LDFLAGS="$LDFLAGS -lprofiler"
+
+
# Check for cluster requirements. Need openais 0.80.3 or higher.x1
save_ldflags=$LDFLAGS
LDFLAGS="$LDFLAGS -L/usr/lib/openais -L/usr/lib64/openais"