Don't add 'no' to cflags when libkrb5 is not threadsafe

FreeRADIUS · Dec 13, 2013 · 09f7666 · 09f7666
1 parent dbbcdcb
commit 09f7666
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/modules/rlm_krb5/configure b/src/modules/rlm_krb5/configure
@@ -2889,7 +2889,7 @@ $as_echo_n "checking canonical API type... " >&6; }
 $as_echo "MIT" >&6; }
 
 			if test "$krb5_version" -le 1114 > /dev/null 2>&1; then
-				krb5threadsafe=no
+				krb5threadsafe='no'
 				{ $as_echo "$as_me:${as_lineno-$LINENO}: marking libkrb5 as non-threadsafe due to defects in MIT libkrb5 <= 1.11.4" >&5
 $as_echo "$as_me: marking libkrb5 as non-threadsafe due to defects in MIT libkrb5 <= 1.11.4" >&6;}
 			fi
@@ -4208,7 +4208,7 @@ fi
 
 	fi
 
-				if test "$krb5threadsafe" == ""; then
+				if test "$krb5threadsafe" != "no"; then
 		krb5threadsafe=
 
 
@@ -4406,8 +4406,9 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
 		fi
+	else
+		krb5threadsafe=""
 	fi
-
 	targetname=rlm_krb5
 else
 	targetname=

diff --git a/src/modules/rlm_krb5/configure.ac b/src/modules/rlm_krb5/configure.ac
@@ -56,7 +56,7 @@ if test x$with_[]modname != xno; then
 			AC_MSG_RESULT([MIT])
 
 			if test "$krb5_version" -le 1114 > /dev/null 2>&1; then
-				krb5threadsafe=no
+				krb5threadsafe='no'
 				AC_MSG_NOTICE([marking libkrb5 as non-threadsafe due to defects in MIT libkrb5 <= 1.11.4])
 			fi
 		else
@@ -123,16 +123,17 @@ if test x$with_[]modname != xno; then
 	dnl #
 	dnl # Only check if version checks have not found kerberos to be thread unsafe
 	dnl #
-	if test "$krb5threadsafe" == ""; then
+	if test "$krb5threadsafe" != "no"; then
 		krb5threadsafe=
 		FR_SMART_CHECK_LIB(krb5, krb5_is_thread_safe)
 
 		if test "x$ac_cv_lib_krb5_krb5_is_thread_safe" == xyes; then
 		AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <krb5.h>]], [[return krb5_is_thread_safe() ? 0 : 1]])],
 			      [krb5threadsafe="-DKRB5_IS_THREAD_SAFE"], [AC_MSG_WARN([[libkrb5 is not threadsafe]])])
 		fi
+	else
+		krb5threadsafe=""
 	fi
-
 	targetname=modname
 else
 	targetname=