[gnome-control-center/wip/identity: 9/11] build: Enable Kerberos by default if present
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center/wip/identity: 9/11] build: Enable Kerberos by default if present
- Date: Fri, 22 Jun 2012 02:50:33 +0000 (UTC)
commit 56d630834278c75fd5d6ff80ac5cd60aab2f0e24
Author: Bastien Nocera <hadess hadess net>
Date: Wed Mar 7 16:29:22 2012 +0100
build: Enable Kerberos by default if present
https://bugzilla.gnome.org/show_bug.cgi?id=671156
configure.ac | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 86084f1..6b79f3c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,7 +65,7 @@ fi
AC_ARG_ENABLE([kerberos],
AS_HELP_STRING([--enable-kerberos], [Use Kerberos]),
[with_kerberos=$enableval],
- [with_kerberos=no])
+ [with_kerberos=auto])
dnl ==============================================
dnl Check that we meet the dependencies
@@ -219,13 +219,13 @@ fi
AC_SUBST(KRB5_CFLAGS)
AC_SUBST(KRB5_LIBS)
-if test "$with_kerberos" = "yes" ; then
+if test "$with_kerberos" != "no" ; then
if test "$have_kerberos" = "no" ; then
AC_MSG_ERROR([kerberos support requested, but not available])
fi
AC_DEFINE(HAVE_KERBEROS, 1, [Define to 1 if kerberos is available])
fi
-AM_CONDITIONAL(BUILD_KERBEROS, [test x$with_kerberos = xyes])
+AM_CONDITIONAL(BUILD_KERBEROS, [test x$with_kerberos != xno])
USER_ACCOUNTS_PANEL_CFLAGS="$USER_ACCOUNTS_PANEL_CFLAGS $KRB5_CFLAGS"
USER_ACCOUNTS_PANEL_LIBS="$USER_ACCOUNTS_PANEL_LIBS $KRB5_LIBS"
@@ -570,8 +570,8 @@ if test "x$have_cheese" = "xyes"; then
else
AC_MSG_NOTICE([ Users panel webcam support disabled])
fi
-if test "x$with_kerberos" = "xyes"; then
- AC_MSG_NOTICE([** Kerberos])
+if test "x$with_kerberos" != "xno"; then
+ AC_MSG_NOTICE([** Kerberos (Users panel Kerberos support)])
else
AC_MSG_NOTICE([ Users panel Kerberos support disabled])
fi
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]