mirror of
https://github.com/samba-team/samba.git
synced 2025-02-28 01:58:17 +03:00
Merger krb5-config and libtinfo to SAMBA_3_0
(This used to be commit 864809707b0acf34e19b4234960e888b6737b39e)
This commit is contained in:
parent
660d9ad986
commit
79613f6146
@ -742,7 +742,7 @@ AC_ARG_WITH(readline,
|
||||
AC_CHECK_HEADERS(readline/history.h)
|
||||
|
||||
AC_CHECK_HEADERS(readline.h readline/readline.h,[
|
||||
for termlib in ncurses curses termcap terminfo termlib; do
|
||||
for termlib in ncurses curses termcap terminfo termlib tinfo; do
|
||||
AC_CHECK_LIB(${termlib}, tgetent, [TERMLIBS="-l${termlib}"; break])
|
||||
done
|
||||
AC_CHECK_LIB(readline, rl_callback_handler_install,
|
||||
@ -2081,6 +2081,21 @@ AC_MSG_RESULT($with_ads_support)
|
||||
FOUND_KRB5=no
|
||||
if test x"$with_ads_support" = 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
|
||||
LIBS="$LIBS `$KRB5_CONFIG --libs`"
|
||||
CFLAGS="$CFLAGS `$KRB5_CONFIG --cflags`"
|
||||
CPPFLAGS="$CPPFLAGS `$KRB5_CONFIG --cflags`"
|
||||
FOUND_KRB5=yes
|
||||
AC_MSG_RESULT(yes)
|
||||
else
|
||||
AC_MSG_RESULT(no. Fallback to previous krb5 detection strategy)
|
||||
fi
|
||||
|
||||
if test x$FOUND_KRB5 = x"no"; then
|
||||
#################################################
|
||||
# check for location of Kerberos 5 install
|
||||
AC_MSG_CHECKING(for kerberos 5 install path)
|
||||
@ -2101,7 +2116,7 @@ if test x"$with_ads_support" = x"yes"; then
|
||||
esac ],
|
||||
AC_MSG_RESULT(no)
|
||||
)
|
||||
|
||||
fi
|
||||
|
||||
if test x$FOUND_KRB5 = x"no"; then
|
||||
#################################################
|
||||
|
Loading…
x
Reference in New Issue
Block a user