From f4b13c8d16754f29a331fe7ec2c7e1bc7995c524 Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Mon, 30 Nov 2009 18:55:13 +0000 Subject: Rearranged chack for ruby so that we only need ruby if we need to generate code git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@885536 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'qpid/cpp') diff --git a/qpid/cpp/configure.ac b/qpid/cpp/configure.ac index 98ebe37364..859e849130 100644 --- a/qpid/cpp/configure.ac +++ b/qpid/cpp/configure.ac @@ -146,8 +146,6 @@ AM_CONDITIONAL([HAS_RPMLINT], [test -n "$RPMLINT"]) # It requires several external tools and files, which we check for here. AC_CHECK_PROG([RUBY], [ruby], [ruby]) -test -n "$RUBY" && generate=yes -test -z "$RUBY" && AC_MSG_ERROR([Missing ruby installation (try "yum install ruby").]) # Swig binding generator is needed for the script (Ruby, Python, etc.) bindings. AC_PROG_SWIG(1.3.26) @@ -239,6 +237,7 @@ specdir=`pwd`/$srcdir/../specs AMQP_FINAL_XML=$specdir/amqp.0-10-qpid-errata.xml AC_SUBST(AMQP_FINAL_XML) AM_CONDITIONAL([GENERATE], [test -f $AMQP_FINAL_XML]) +test -f $AMQP_FINAL_XML -a -z "$RUBY" && AC_MSG_ERROR([Missing ruby installation (try "yum install ruby").]) # URL and download URL for the package. URL=http://rhm.et.redhat.com/qpidc -- cgit v1.2.1