r4349: Start to fix the long-standing pain that --with-krb5 would be ignored if krb5...

I'll merge this to Samba3, before trying to merge all of the Samba3
changes to Samba4.

Andrew Bartlett
(This used to be commit 906ba7cb8af02d44c868805e0b108b966f3221af)

diff --git a/source4/libads/config.m4 b/source4/libads/config.m4
index d9488f1401a2325da835379cff60b6126597e6e9..a696c54e0206f632f978d131c6f4ed49954fa755 100644 (file)
--- a/source4/libads/config.m4
+++ b/source4/libads/config.m4
@@ -130,8 +130,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

-       AC_PATH_PROG(KRB5_CONFIG, krb5-config)
-       AC_MSG_CHECKING(for working krb5-config)
+       AC_PATH_PROG(KRB5_CONFIG, $krb5_withval/krb5-config)
+       AC_MSG_CHECKING(for working $krb5_withval/krb5-config)

        if test -x "$KRB5_CONFIG"; then
                ac_save_CFLAGS=$CFLAGS
                CFLAGS="";export CFLAGS
        if test -x "$KRB5_CONFIG"; then
                ac_save_CFLAGS=$CFLAGS
                CFLAGS="";export CFLAGS


@@ -145,7 +145,29 @@ if test x$with_krb5_support != x"no"; then
                FOUND_KRB5=yes
                AC_MSG_RESULT(yes)
        else
                FOUND_KRB5=yes
                AC_MSG_RESULT(yes)
        else

-               AC_MSG_RESULT(no. Fallback to previous krb5 detection strategy)
+               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
+                       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 previous krb5 detection strategy)
+               fi

        fi
   
        if test x$FOUND_KRB5 != x"yes"; then
        fi
   
        if test x$FOUND_KRB5 != x"yes"; then