diff options
| author | Alan Conway <aconway@apache.org> | 2007-08-01 16:50:33 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-08-01 16:50:33 +0000 |
| commit | 28b22a308cb6cf0232067636fb6676a4c96d82f7 (patch) | |
| tree | 1f5b4cd32c425ffda3a7295dd47f0aaba3c0ce25 /cpp/configure.ac | |
| parent | 9235b5d09b3273c7c495ff266e18781fad363a9b (diff) | |
| download | qpid-python-28b22a308cb6cf0232067636fb6676a4c96d82f7.tar.gz | |
* src/generate.sh: Moved requirements test to configure.ac
* rubygen: Cleanup and improvements, template for cluster work.
* configure.ac:
- support for ruby code generator + cleanup.
- moved "can generate" tests to configure.ac
- removed redundant APR stuff.
* bootstrap: Remove codegen from bootstrap, all in config/make.
* src/Makefile.am (libqpidcommon_la_LIBADD):
- Ruby code generator.
- Improvements to existing generator rules.
- Removed APR stuff.
* configure.ac (CPPUNIT_CXXFLAGS): Removed APR stuff.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@561869 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/configure.ac')
| -rw-r--r-- | cpp/configure.ac | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/cpp/configure.ac b/cpp/configure.ac index f94710232a..86a0347248 100644 --- a/cpp/configure.ac +++ b/cpp/configure.ac @@ -90,28 +90,7 @@ CPPUNIT_CXXFLAGS=$CPPUNIT_CFLAGS AC_SUBST(CPPUNIT_LIBS) AC_SUBST(CPPUNIT_CXXFLAGS) -AC_ARG_ENABLE([apr-platform], - [AS_HELP_STRING([--enable-apr-platform], - [use the Apache Portable Runtime library for platform (default no)])], - [case $enableval in - yes|no) enable_APR_PLATFORM=$enableval;; - *) AC_MSG_ERROR([Invalid value for --enable-apr-platform: $enableval]);; - esac], - [enable_APR_PLATFORM=no] -) -AM_CONDITIONAL([USE_APR_PLATFORM], [test x$enable_APR_PLATFORM = xyes]) - -APR_MINIMUM_VERSION=1.2.2 -AC_SUBST(APR_MINIMUM_VERSION) -AC_SUBST(APR_CXXFLAGS) -AC_SUBST(USE_APR_PLATFORM) - -if test "$enable_APR_PLATFORM" = yes; then - PKG_CHECK_MODULES([APR], [apr-1 >= $APR_MINIMUM_VERSION]) - APR_CXXFLAGS="$APR_CFLAGS -DUSE_APR_PLATFORM=1" - USE_APR_PLATFORM=1 -fi - +# Enable Valgrind AC_ARG_ENABLE([valgrind], [AS_HELP_STRING([--enable-valgrind], [run valgrind memory checker on tests, if available (default yes)])], @@ -132,6 +111,22 @@ test "$enable_VALGRIND" = no && VALGRIND= AC_CHECK_PROG([RPMLINT], [rpmlint], [rpmlint]) AM_CONDITIONAL([HAS_RPMLINT], [test -n "$RPMLINT"]) +# Code generation: generated code is included in the distribution +# so code generation is only required in an svn checkout. +# It requires several external tools and files, which we check for here. + +AC_CHECK_PROG([RUBY], [ruby], [ruby]) +AC_CHECK_PROG([JAVA], [java], [java]) +AC_CHECK_PROG([JAVAC], [javac], [javc]) +test -n "$RUBY" -a -n "$JAVA" -a -n "$JAVAC" && generate=yes + +specdir=`pwd`/$srcdir/../specs +AMQP_XML=$specdir/amqp-transitional.0-10.xml +AC_SUBST(AMQP_XML) +ls $AMQP_XML >/dev/null 2>&1 || generate=no + +AM_CONDITIONAL([GENERATE], [test x$generate = xyes]) + # URL and download URL for the package. URL=http://rhm.et.redhat.com/qpidc AC_SUBST(URL) |