sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-19 10:03:58 +03:00
Code

Actually pick up the kerberos libs in RedHat - the previous shell construct

Browse Source 
didn't seem to work properly.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett -
parent d9a91a4144
commit c0925b6352
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/configure vendored
View File

@ -12077,11 +12077,11 @@ fi
echo "$ac_t""$with_ads_support" 1>&6
FOUND_KRB5=no
if test x"$with_ads_support" = x"yes"; then
#################################################
# check for location of Kerberos 5 install
FOUND_KRB5=0
echo $ac_n "checking for kerberos 5 install path""... $ac_c" 1>&6
echo "configure:12087: checking for kerberos 5 install path" >&5
# Check whether --with-krb5 or --without-krb5 was given.
@ -12097,7 +12097,7 @@ if test "${with_krb5+set}" = set; then
CFLAGS="$CFLAGS -I$withval/include"
CPPFLAGS="$CPPFLAGS -I$withval/include"
LDFLAGS="$LDFLAGS -L$withval/lib"
FOUND_KRB5=1
FOUND_KRB5=yes
;;
esac
else
@ -12107,7 +12107,7 @@ fi
if $FOUND_KRB5 = 0 ; then
if test x$FOUND_KRB5 = x"no"; then
#################################################
# see if this box has the RedHat location for kerberos
echo $ac_n "checking for /usr/kerberos""... $ac_c" 1>&6
@ -12768,7 +12768,7 @@ fi
###############################################
# test for where we get crypt() from, but only
# if not using PAM
if test $with_pam_for_crypt = no; then
if test x"$with_pam_for_crypt" = x"no"; then
for ac_func in crypt
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

8
source/configure.in
View File

@ -1961,11 +1961,11 @@ fi
AC_MSG_RESULT($with_ads_support)
FOUND_KRB5=no
if test x"$with_ads_support" = x"yes"; then
#################################################
# check for location of Kerberos 5 install
FOUND_KRB5=0
AC_MSG_CHECKING(for kerberos 5 install path)
AC_ARG_WITH(krb5,
[ --with-krb5=base-dir Locate Kerberos 5 support (default=/usr)],
@ -1979,14 +1979,14 @@ FOUND_KRB5=0
CFLAGS="$CFLAGS -I$withval/include"
CPPFLAGS="$CPPFLAGS -I$withval/include"
LDFLAGS="$LDFLAGS -L$withval/lib"
FOUND_KRB5=1
FOUND_KRB5=yes
;;
esac ],
AC_MSG_RESULT(no)
)
if [ $FOUND_KRB5 = 0 ]; then
if test x$FOUND_KRB5 = x"no"; then
#################################################
# see if this box has the RedHat location for kerberos
AC_MSG_CHECKING(for /usr/kerberos)
@ -2168,7 +2168,7 @@ AC_ARG_WITH(pam_smbpass,
###############################################
# test for where we get crypt() from, but only
# if not using PAM
if test $with_pam_for_crypt = no; then
if test x"$with_pam_for_crypt" = x"no"; then
AC_CHECK_FUNCS(crypt)
if test x"$ac_cv_func_crypt" = x"no"; then
AC_CHECK_LIB(crypt, crypt, [LIBS="$LIBS -lcrypt";