summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/configure.ac9
1 files changed, 6 insertions, 3 deletions
diff --git a/cpp/configure.ac b/cpp/configure.ac
index c7593247ca..0334b00fe9 100644
--- a/cpp/configure.ac
+++ b/cpp/configure.ac
@@ -36,11 +36,14 @@ AC_ARG_ENABLE(warnings,
# Turn on this automake conditional if we are in a qpid
# hierarchy (i.e. with gentools/ and specs/ sibling directories),
# and if we have working java + javac.
-build=yes
AC_CHECK_PROGS([JAVA], [java], [no])
AC_CHECK_PROGS([JAVAC], [javac], [no])
-AM_CONDITIONAL([CAN_GENERATE_CODE],
- [test x$JAVA = xyes -a x$JAVAC = xyes -a -d $srcdir/../gentools -a -d $srcdir/../specs ])
+build=yes
+test x$JAVA = xno && build=no
+test x$JAVAC = xno && build=no
+test -d $srcdir/../gentools || build=no
+test -d $srcdir/../specs || build=no
+AM_CONDITIONAL([CAN_GENERATE_CODE], [test x$build = xyes])
# Warnings: Enable as many as possible, keep the code clean. Please
# do not disable warnings or remove -Werror without discussing on