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 | 8b62e0738891e73e4b09fb0b2be3080906738b7a (patch) | |
| tree | f12cdc482d52d08ea41366d56c1b48aadd85712e /qpid/cpp | |
| parent | ddeb37809193cdd56819efca38bcc545037f17fc (diff) | |
| download | qpid-python-8b62e0738891e73e4b09fb0b2be3080906738b7a.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@938026 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/configure.ac | 7 | ||||
| -rw-r--r-- | qpid/cpp/etc/Makefile.am | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/qpid/cpp/configure.ac b/qpid/cpp/configure.ac index adcf4c5dd2..4eec5f1235 100644 --- a/qpid/cpp/configure.ac +++ b/qpid/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 diff --git a/qpid/cpp/etc/Makefile.am b/qpid/cpp/etc/Makefile.am index 8731641360..c91dbcbbad 100644 --- a/qpid/cpp/etc/Makefile.am +++ b/qpid/cpp/etc/Makefile.am @@ -52,7 +52,7 @@ sasldb_DATA = $(SASL_DB) # these reasons we always want the broker to specify a realm where its # users live, and we want the users to exist in that realm as well. $(SASL_DB): - echo guest | /usr/sbin/saslpasswd2 -c -p -f $(SASL_DB) -u QPID guest + echo guest | $(SASL_PASSWD) -c -p -f $(SASL_DB) -u QPID guest CLEANFILES=$(SASL_DB) |