diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2010-04-26 12:50:22 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2010-04-26 12:50:22 +0000 |
| commit | 67c5accb682e347436f2db76fa007119569ae9be (patch) | |
| tree | a745f8d65e9c18dbc4f4de3f299b034533caddcc /cpp/configure.ac | |
| parent | b6dde23b3644ee2a375aea58291e88c31e536a28 (diff) | |
| download | qpid-python-67c5accb682e347436f2db76fa007119569ae9be.tar.gz | |
QPID-1811: Look for saslpasswd2 at configure time instead of hardcoding
its location (autotools build only as cmake build doesn't currently build
a custom sasl passwd file)
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@938026 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/configure.ac')
| -rw-r--r-- | cpp/configure.ac | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cpp/configure.ac b/cpp/configure.ac index adcf4c5dd2..4eec5f1235 100644 --- a/cpp/configure.ac +++ b/cpp/configure.ac @@ -330,9 +330,12 @@ AS_IF([test "x$WANT_SASL" != xno], [AC_DEFINE([BROKER_SASL_NAME], ["qpidd"], [The SASL app name for the qpid Broker]) AC_DEFINE([HAVE_SASL], [1], [Enable if libsasl is present]) - have_sasl=yes])]) + have_sasl=yes]) + AC_PATH_PROG([SASL_PASSWD], [saslpasswd2], [], [$PATH$PATH_SEPARATOR/usr/sbin]) + AS_IF([test x$SASL_PASSWD = x], [AC_MSG_ERROR([saslpasswd2 not found])], []) + ]) AM_CONDITIONAL([HAVE_SASL], [test "x$have_sasl" = xyes]) - +AC_SUBST([SASL_PASSWD]) # Setup --with-xml/--without-xml as arguments to configure use_xml=yes |