You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2014/10/14 08:03:39 UTC
git commit: Modify configure.ac to fix --with-sasl.
Repository: mesos
Updated Branches:
refs/heads/master eaf703abc -> 555d0580e
Modify configure.ac to fix --with-sasl.
Fixes MESOS-1839.
Review: https://reviews.apache.org/r/26133
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/555d0580
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/555d0580
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/555d0580
Branch: refs/heads/master
Commit: 555d0580e4666e6cc8f5d04c30938f53649972a2
Parents: eaf703a
Author: Michael Park <mc...@gmail.com>
Authored: Mon Oct 13 23:03:30 2014 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Mon Oct 13 23:03:30 2014 -0700
----------------------------------------------------------------------
configure.ac | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/555d0580/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index da1c82d..2b372e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -184,7 +184,7 @@ AC_ARG_WITH([curl],
[specify where to locate the curl library]),
[], [])
-AC_ARG_WITH([sasl2],
+AC_ARG_WITH([sasl],
AS_HELP_STRING([--with-sasl=@<:@=DIR@:>@],
[specify where to locate the sasl2 library]),
[], [])
@@ -621,6 +621,14 @@ libcurl is required for mesos to build.
])])
+# Check if Sasl2 prefix path was provided, and if so, add it to
+# the CPPFLAGS and LDFLAGS with respective /include and /lib path
+# suffixes.
+if test -n "`echo $with_sasl`" ; then
+ CPPFLAGS="-I${with_sasl}/include $CPPFLAGS"
+ LDFLAGS="-L${with_sasl}/lib $LDFLAGS"
+fi
+
# TODO(benh): Also check for md5 support so we can use the CRAM-MD5
# mechanism. We can likely do a AC_CHECK_LIB looking for a particular
# function only provided if md5 support is present.
@@ -631,14 +639,6 @@ We need libsasl2 for authentication!
-------------------------------------------------------------------
])])
-# Check if Sasl2 prefix path was provided, and if so, add it to
-# the CPPFLAGS and LDFLAGS with respective /include and /lib path
-# suffixes.
-if test -n "`echo $with_sasl2`" ; then
- CPPFLAGS="-I${with_sasl2}/include $CPPFLAGS"
- LDFLAGS="-L${with_sasl2}/lib $LDFLAGS"
-fi
-
# Perform necessary configuration for network isolator.
if test "x$with_network_isolator" = "xyes"; then
# Check for OS support.