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

r4923: Avoid using krb5-config in the path if a krb5 prefix was already set.

Browse Source 
Andrew Bartlett
(This used to be commit ff8298bb90b78dc52c11e2cdecf5041b9e243f35)
This commit is contained in:
Andrew Bartlett 2005-01-22 02:39:05 +00:00 committed by Gerald (Jerry) Carter
parent 5ffedbac3d
commit ba5d77bebd
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
source4/libads/config.m4
View File

@ -96,6 +96,7 @@ with_krb5_support=auto
krb5_withval=auto krb5_withval=auto
AC_MSG_CHECKING([for KRB5 support]) AC_MSG_CHECKING([for KRB5 support])
KRB5_CONFIG=""
# Do no harm to the values of CFLAGS and LIBS while testing for # Do no harm to the values of CFLAGS and LIBS while testing for
# Kerberos support. # Kerberos support.
AC_ARG_WITH(krb5, AC_ARG_WITH(krb5,
@ -120,6 +121,7 @@ AC_ARG_WITH(krb5,
with_krb5_support=yes with_krb5_support=yes
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
krb5_withval=$withval krb5_withval=$withval
KRB5_CONFIG="$krb5_withval/bin/krb5-config"
;; ;;
esac ], esac ],
AC_MSG_RESULT($with_krb5_support) AC_MSG_RESULT($with_krb5_support)
@ -130,29 +132,8 @@ if test x$with_krb5_support != x"no"; then
################################################# #################################################
# check for krb5-config from recent MIT and Heimdal kerberos 5 # check for krb5-config from recent MIT and Heimdal kerberos 5
KRB5_CONFIG="$krb5_withval/bin/krb5-config" AC_MSG_CHECKING(for working specified location for krb5-config)
AC_MSG_CHECKING(for working $krb5_withval/bin/krb5-config) if test x$KRB5_CONFIG != "x"; then
if test -x "$KRB5_CONFIG"; then
ac_save_CFLAGS=$CFLAGS
CFLAGS="";export CFLAGS
ac_save_LDFLAGS=$LDFLAGS
LDFLAGS="";export LDFLAGS
KRB5_LIBS="`$KRB5_CONFIG --libs gssapi`"
KRB5_CFLAGS="`$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`"
KRB5_CPPFLAGS="`$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`"
CFLAGS=$ac_save_CFLAGS;export CFLAGS
LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS
FOUND_KRB5=yes
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no. Fallback to finding krb5-config in path)
fi
if test x$FOUND_KRB5 != x"yes"; then
#################################################
# check for krb5-config from recent MIT and Heimdal kerberos 5
AC_PATH_PROG(KRB5_CONFIG, krb5-config)
AC_MSG_CHECKING(for working krb5-config)
if test -x "$KRB5_CONFIG"; then if test -x "$KRB5_CONFIG"; then
ac_save_CFLAGS=$CFLAGS ac_save_CFLAGS=$CFLAGS
CFLAGS="";export CFLAGS CFLAGS="";export CFLAGS
@ -164,7 +145,28 @@ if test x$with_krb5_support != x"no"; then
CFLAGS=$ac_save_CFLAGS;export CFLAGS CFLAGS=$ac_save_CFLAGS;export CFLAGS
LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS
FOUND_KRB5=yes FOUND_KRB5=yes
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes. Found $KRB5_CONFIG)
else
AC_MSG_RESULT(no. Fallback to specified directory)
fi
else
AC_MSG_RESULT(no. Fallback to finding krb5-config in path)
#################################################
# check for krb5-config from recent MIT and Heimdal kerberos 5
AC_PATH_PROG(KRB5_CONFIG, krb5-config)
AC_MSG_CHECKING(for working krb5-config in path)
if test -x "$KRB5_CONFIG"; then
ac_save_CFLAGS=$CFLAGS
CFLAGS="";export CFLAGS
ac_save_LDFLAGS=$LDFLAGS
LDFLAGS="";export LDFLAGS
KRB5_LIBS="`$KRB5_CONFIG --libs gssapi`"
KRB5_CFLAGS="`$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`"
KRB5_CPPFLAGS="`$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`"
CFLAGS=$ac_save_CFLAGS;export CFLAGS
LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS
FOUND_KRB5=yes
AC_MSG_RESULT(yes. Found $KRB5_CONFIG)
else else
AC_MSG_RESULT(no. Fallback to previous krb5 detection strategy) AC_MSG_RESULT(no. Fallback to previous krb5 detection strategy)
fi fi