You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@qpid.apache.org by kp...@apache.org on 2006/12/15 19:41:05 UTC

svn commit: r487616 - /incubator/qpid/trunk/qpid/cpp/configure.ac

Author: kpvdr
Date: Fri Dec 15 10:41:04 2006
New Revision: 487616

URL: http://svn.apache.org/viewvc?view=rev&rev=487616
Log:
[for Jim Meyring] configure.ac: Restore the logic used to determine whether to

Modified:
    incubator/qpid/trunk/qpid/cpp/configure.ac

Modified: incubator/qpid/trunk/qpid/cpp/configure.ac
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/configure.ac?view=diff&rev=487616&r1=487615&r2=487616
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/configure.ac (original)
+++ incubator/qpid/trunk/qpid/cpp/configure.ac Fri Dec 15 10:41:04 2006
@@ -36,11 +36,14 @@
 # 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