You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2010/04/26 14:50:22 UTC
svn commit: r938026 - in /qpid/trunk/qpid/cpp: configure.ac etc/Makefile.am
Author: astitcher
Date: Mon Apr 26 12:50:22 2010
New Revision: 938026
URL: http://svn.apache.org/viewvc?rev=938026&view=rev
Log:
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)
Modified:
qpid/trunk/qpid/cpp/configure.ac
qpid/trunk/qpid/cpp/etc/Makefile.am
Modified: qpid/trunk/qpid/cpp/configure.ac
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/configure.ac?rev=938026&r1=938025&r2=938026&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/configure.ac (original)
+++ qpid/trunk/qpid/cpp/configure.ac Mon Apr 26 12:50:22 2010
@@ -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
Modified: qpid/trunk/qpid/cpp/etc/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/etc/Makefile.am?rev=938026&r1=938025&r2=938026&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/etc/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/etc/Makefile.am Mon Apr 26 12:50:22 2010
@@ -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)
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org