diff options
| author | Alan Conway <aconway@apache.org> | 2006-12-04 17:03:39 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2006-12-04 17:03:39 +0000 |
| commit | b9d2b4bc80748d0a6a7209d0ce5dce97565c83ae (patch) | |
| tree | f5f3fcfe6f9adb6f4f3fc5f6bbbce21ff0dd5c58 /cpp/configure.ac | |
| parent | d7bd6ba4267f9c2ff2ce4165f226cf1317013005 (diff) | |
| download | qpid-python-b9d2b4bc80748d0a6a7209d0ce5dce97565c83ae.tar.gz | |
2006-12-01 Jim Meyering <meyering@redhat.com>
* configure.ac: Use an automake conditional to indicate when we
have access to files outside of the current hierarchy, and when
we have the tools (java and javac) to build some generated files.
* gen/Makefile.am: Don't use $(abs_srcdir); not needed.
(timestamp): Depend on java sources and C++ template files,
if we're building in a qpid tree.
Use $(JAVA) and $(JAVAC), rather than hard-coding those names.
(gen-src.mk) [$(java_sources), $(cxx_templates)]: New rules to
generate these lists of file names.
* bootstrap: Also generate gen/gen-src.mk.
But do that only if we're in a qpid hierarchy.
Redirect make's stdout to /dev/null.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@482255 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/configure.ac')
| -rw-r--r-- | cpp/configure.ac | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/cpp/configure.ac b/cpp/configure.ac index 955c114a7e..95e2f6ca1d 100644 --- a/cpp/configure.ac +++ b/cpp/configure.ac @@ -33,6 +33,19 @@ AC_ARG_ENABLE(warnings, esac], [enableval=yes]) +# 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]) +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([BUILD_IN_MESSAGE_TREE], [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 # qpid-dev list. |