diff options
| author | Alan Conway <aconway@apache.org> | 2007-04-11 19:53:32 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-04-11 19:53:32 +0000 |
| commit | 1fd57585c8ea536630d69de3fc16ce0c6f81c82b (patch) | |
| tree | dc6a92d539d14a333c5033938d13b08edad9c9b9 /cpp/configure.ac | |
| parent | f7f31c6a720d23749b23735b71cd401d93ded9b5 (diff) | |
| download | qpid-python-1fd57585c8ea536630d69de3fc16ce0c6f81c82b.tar.gz | |
* cpp/qpidc.spec.in: Added qpidd-devel sub-package.
* cpp/configure.ac: Use a more reliable srcdir test file.
* cpp/docs/api/Makefile.am: Fix bug in VPATH builds.
* cpp/gentools/*, src/**.h,**.cpp: Fix #includes of files in gen/
* cpp/rpm/Makefile.am: Removed. RPM targets defined in top level Makefile.am.
* cpp/Makefile.am: Add RPM targets, fix VPATH bug with RPM targets
* cpp/rpm/README.qpidd-devel: placeholder for qpidd-devel documentation.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@527639 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/configure.ac')
| -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 53989dcdbc..bf0001226a 100644 --- a/cpp/configure.ac +++ b/cpp/configure.ac @@ -16,7 +16,7 @@ AM_INIT_AUTOMAKE([dist-bzip2]) AC_PREREQ(2.59) AC_CONFIG_HEADERS([config.h:config.in]) -AC_CONFIG_SRCDIR([src/broker/Broker.cpp]) +AC_CONFIG_SRCDIR([qpidc.spec.in]) AC_PROG_CC_STDC #AM_PROG_CC_C_O @@ -41,7 +41,7 @@ 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/gentools || build=no test -d $srcdir/../specs || build=no AM_CONDITIONAL([CAN_GENERATE_CODE], [test x$build = xyes]) @@ -136,6 +136,10 @@ AC_ARG_ENABLE(valgrind, AC_CHECK_PROG([VALGRIND], [valgrind], [valgrind]) test "$enable_VALGRIND" = no && VALGRIND= +# If rpmlint is availalbe we'll run it when building RPMs. +AC_CHECK_PROG([RPMLINT], [rpmlint], [rpmlint]) +AM_CONDITIONAL([HAS_RPMLINT], [test -n "$RPMLINT"]) + AC_CONFIG_FILES([ Makefile src/Makefile @@ -144,7 +148,6 @@ AC_CONFIG_FILES([ docs/api/Makefile docs/api/user.doxygen docs/api/developer.doxygen - rpm/Makefile ]) AC_OUTPUT |