diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2006-12-15 18:41:04 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2006-12-15 18:41:04 +0000 |
| commit | 69af63bbdac9e160fc199de0481848e6fc994b57 (patch) | |
| tree | 542f73d82f26f5ffb13b655165213cf7cc818781 /cpp | |
| parent | 37bae33a43029e6c6e6ff1818d87763d5278da0c (diff) | |
| download | qpid-python-69af63bbdac9e160fc199de0481848e6fc994b57.tar.gz | |
[for Jim Meyring] configure.ac: Restore the logic used to determine whether to
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@487616 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/configure.ac | 9 |
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 |