summaryrefslogtreecommitdiff
path: root/qpid/cpp/configure.ac
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2008-05-09 18:09:43 +0000
committerGordon Sim <gsim@apache.org>2008-05-09 18:09:43 +0000
commit485022ac7cd72b40cb4c99f2e27389d016a31371 (patch)
tree5fc20fa2f28fe3d20b3db6237317580839b3fd6e /qpid/cpp/configure.ac
parent3e41544f9e3a66d4ab8b554ad6e2c864b48b79c6 (diff)
downloadqpid-python-485022ac7cd72b40cb4c99f2e27389d016a31371.tar.gz
QPID-648: Patch from Matt Farrellee
- support for realms - updates to packaging to create a default db and the necessary conf files for plain and anon git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@654902 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/configure.ac')
-rw-r--r--qpid/cpp/configure.ac8
1 files changed, 6 insertions, 2 deletions
diff --git a/qpid/cpp/configure.ac b/qpid/cpp/configure.ac
index 751ca7ce80..646f39025d 100644
--- a/qpid/cpp/configure.ac
+++ b/qpid/cpp/configure.ac
@@ -177,6 +177,7 @@ AS_IF([test "x$WANT_SASL" != xyes -a \
[AC_MSG_ERROR([Bad value for --with-sasl: $withval])])
# If we weren't explicitly asked /not/ to test, i.e. not given --without-sasl
+have_sasl=no
AS_IF([test "x$WANT_SASL" != xno],
# Perform tests for headers and libraries. Remember, AC_CHECK_LIB
# will give you some useful default behavior, e.g. setup LDFLAGS, if
@@ -189,10 +190,12 @@ AS_IF([test "x$WANT_SASL" != xno],
# And we were given --with, then fail
[AS_IF([test "x$WANT_SASL" = xyes],
[AC_MSG_ERROR([sasl requested but not available])])],
- # Otherwise, no tests failed, setup AC_SUBST/AC_DEFINE/AM_CONDITIONALs
+ # Otherwise, no tests failed, setup AC_SUBST/AC_DEFINE/vars for AM_CONDITIONALs
[AC_DEFINE([BROKER_SASL_NAME], ["qpidd"],
[The SASL app name for the qpid Broker])
- AC_DEFINE([HAVE_SASL], [1], [Enable if libsasl is present])])])
+ AC_DEFINE([HAVE_SASL], [1], [Enable if libsasl is present])
+ have_sasl=yes])])
+AM_CONDITIONAL([HAVE_SASL], [test "x$have_sasl" = xyes])
# Setup --with-xml/--without-xml as arguments to configure
@@ -261,6 +264,7 @@ AC_CONFIG_FILES([
Makefile
examples/Makefile
managementgen/Makefile
+ etc/Makefile
src/Makefile
src/tests/Makefile
docs/man/Makefile