diff options
| author | Alan Conway <aconway@apache.org> | 2007-05-11 20:11:32 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-05-11 20:11:32 +0000 |
| commit | e9a6d2e94a849b83b4a49b9d92392c382962d42e (patch) | |
| tree | be11604e52756069e87c8131a793313b6e3a95a0 /qpid/cpp/configure.ac | |
| parent | 88b85e0542ce4324179f5b2d2eaf4498ce00038c (diff) | |
| download | qpid-python-e9a6d2e94a849b83b4a49b9d92392c382962d42e.tar.gz | |
* cpp/src/Makefile.am: Move generated code into src. Fix generation script.
* cpp/src/generate.sh: New generator script, simplify & fix some problems.
* cpp/Makefile.am: removed gen subdir
* cpp/bootstrap: remove redundant comment
* cpp/configure.ac: remove generator tests, now in generate.sh
* cpp/gen,cpp/gen/Makefile.am,cpp/gen/gen-src-mk.sh: Replaced by generate.sh
* cpp/src/tests/Makefile.am: Remove client_test from EXTRA_DEPS
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@537278 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/configure.ac')
| -rw-r--r-- | qpid/cpp/configure.ac | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/qpid/cpp/configure.ac b/qpid/cpp/configure.ac index 748d15fe46..1901480a4b 100644 --- a/qpid/cpp/configure.ac +++ b/qpid/cpp/configure.ac @@ -15,7 +15,7 @@ AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects]) # Minimum Autoconf version required. AC_PREREQ(2.59) -AC_CONFIG_HEADERS([config.h:config.in]) +AC_CONFIG_HEADERS([src/config.h]) AC_CONFIG_SRCDIR([qpidc.spec.in]) AC_PROG_CC_STDC @@ -34,18 +34,6 @@ 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. -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([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 # qpid-dev list. @@ -160,7 +148,6 @@ test -z "$missing" || AC_CONFIG_FILES([ qpidc.spec Makefile - gen/Makefile src/Makefile src/tests/Makefile docs/man/Makefile |