diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-01-22 02:39:05 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:06 -0500 |
| commit | ba5d77bebdcf041a3d2b3dd53fb83fe49ecc4100 (patch) | |
| tree | 20d41800d86838c295920c6a7bcb414d978af445 /source4 | |
| parent | 5ffedbac3d06ef852508dde3924841a86b802295 (diff) | |
| download | samba-ba5d77bebdcf041a3d2b3dd53fb83fe49ecc4100.tar.gz samba-ba5d77bebdcf041a3d2b3dd53fb83fe49ecc4100.tar.bz2 samba-ba5d77bebdcf041a3d2b3dd53fb83fe49ecc4100.zip | |
r4923: Avoid using krb5-config in the path if a krb5 prefix was already set.
Andrew Bartlett
(This used to be commit ff8298bb90b78dc52c11e2cdecf5041b9e243f35)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/libads/config.m4 | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/source4/libads/config.m4 b/source4/libads/config.m4 index 2d78b72d39..14d8704747 100644 --- a/source4/libads/config.m4 +++ b/source4/libads/config.m4 @@ -96,6 +96,7 @@ with_krb5_support=auto krb5_withval=auto AC_MSG_CHECKING([for KRB5 support]) +KRB5_CONFIG="" # Do no harm to the values of CFLAGS and LIBS while testing for # Kerberos support. AC_ARG_WITH(krb5, @@ -120,6 +121,7 @@ AC_ARG_WITH(krb5, with_krb5_support=yes AC_MSG_RESULT(yes) krb5_withval=$withval + KRB5_CONFIG="$krb5_withval/bin/krb5-config" ;; esac ], AC_MSG_RESULT($with_krb5_support) @@ -130,29 +132,29 @@ if test x$with_krb5_support != x"no"; then ################################################# # check for krb5-config from recent MIT and Heimdal kerberos 5 - KRB5_CONFIG="$krb5_withval/bin/krb5-config" - AC_MSG_CHECKING(for working $krb5_withval/bin/krb5-config) - 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) + AC_MSG_CHECKING(for working specified location for 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. 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) - 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) + AC_MSG_CHECKING(for working krb5-config in path) if test -x "$KRB5_CONFIG"; then ac_save_CFLAGS=$CFLAGS CFLAGS="";export CFLAGS @@ -164,7 +166,7 @@ if test x$with_krb5_support != x"no"; then CFLAGS=$ac_save_CFLAGS;export CFLAGS LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS FOUND_KRB5=yes - AC_MSG_RESULT(yes) + AC_MSG_RESULT(yes. Found $KRB5_CONFIG) else AC_MSG_RESULT(no. Fallback to previous krb5 detection strategy) fi |