[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-332-g8b0bee7

[James Peach]

The branch, v3-2-test has been updated
       via  8b0bee7c7688a966777f502c97922d7ad40d841c (commit)
      from  977dc3accb3d440e5fd19591c425da7dc3718d94 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 8b0bee7c7688a966777f502c97922d7ad40d841c
Author: James Peach <jpeach at samba.org>
Date:   Sun Nov 18 13:56:19 2007 -0800

    Detect Heimdal Kerberos on OpenBSD 4.2.
    
    Patch from Sean McCreary <samba-technical at mcwest.org>.

-----------------------------------------------------------------------

Summary of changes:
 source/configure.in |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/configure.in b/source/configure.in
index d37e392..69a8e3f 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -3671,10 +3671,12 @@ if test x"$with_ads_support" != x"no"; then
           KRB5_CFLAGS="-I/usr/include/heimdal"
           KRB5_CPPFLAGS="-I/usr/include/heimdal"
           KRB5_LDFLAGS="-L/usr/lib/heimdal/lib"
+	  FOUND_KRB5=yes
           AC_MSG_RESULT(yes)
       else
           KRB5_CFLAGS="-I/usr/include/heimdal"
           KRB5_CPPFLAGS="-I/usr/include/heimdal"
+	  FOUND_KRB5=yes
           AC_MSG_RESULT(yes)
       fi
     else
@@ -3690,6 +3692,21 @@ if test x"$with_ads_support" != x"no"; then
       KRB5_LDFLAGS="-L/usr/kerberos/lib"
       KRB5_CFLAGS="-I/usr/kerberos/include"
       KRB5_CPPFLAGS="-I/usr/kerberos/include"
+      FOUND_KRB5=yes
+      AC_MSG_RESULT(yes)
+    else
+      AC_MSG_RESULT(no)
+    fi
+  fi
+
+  if test x$FOUND_KRB5 = x"no"; then
+    #################################################
+    # see if this box has the OpenBSD location for heimdal krb5
+    AC_MSG_CHECKING(for /usr/include/kerberosV)
+    if test -d /usr/include/kerberosV; then
+      KRB5_CPPFLAGS="-I/usr/include/kerberosV"
+      KRB5_LIBS="-lcrypto"
+      FOUND_KRB5=yes
       AC_MSG_RESULT(yes)
     else
       AC_MSG_RESULT(no)


-- 
Samba Shared Repository