Attachment 134 Details for Bug 433 – Use krb5-config from --with-krb5 directory

[patch] Use krb5-config from --with-krb5 directory

configure.diff (text/plain), 2.63 KB, created by Tim Potter on 2003-09-10 21:17:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Potter

Created: 2003-09-10 21:17:14 UTC

Size: 2.63 KB

patch

obsolete

>Index: configure.in
>===================================================================
>RCS file: /data/cvs/samba/source/configure.in,v
>retrieving revision 1.300.2.163
>diff -u -r1.300.2.163 configure.in
>--- configure.in	8 Sep 2003 06:30:49 -0000	1.300.2.163
>+++ configure.in	11 Sep 2003 04:12:39 -0000
>@@ -2338,12 +2338,32 @@
> 
> if test x"$with_ads_support" != x"no"; then
> 
>-  # Do no harm to the values of CFLAGS and LIBS while testing for
>-  # Kerberos support.
>+  FOUND_KRB5=no
>+
>+  #################################################
>+  # check for location of Kerberos 5 install
>+  AC_MSG_CHECKING(for kerberos 5 install path)
>+  AC_ARG_WITH(krb5,
>+  [  --with-krb5=base-dir    Locate Kerberos 5 support (default=/usr)],
>+  [ case "$withval" in
>+    yes)
>+      AC_MSG_ERROR(no krb5-path given)
>+      ;;
>+    *)
>+      AC_MSG_RESULT($withval)
>+      KRB5_CFLAGS="-I$withval/include"
>+      KRB5_CPPFLAGS="-I$withval/include"
>+      KRB5_LDFLAGS="-L$withval/lib"
>+      KRB5_BIN="$withval/bin"
>+      FOUND_KRB5=yes
>+      ;;
>+    esac ],
>+    AC_MSG_RESULT(no krb5-path given)
>+  )
> 
>   #################################################
>   # check for krb5-config from recent MIT and Heimdal kerberos 5
>-  AC_PATH_PROG(KRB5_CONFIG, krb5-config)
>+  AC_PATH_PROG(KRB5_CONFIG, krb5-config, [], $KRB5_BIN)
>   AC_MSG_CHECKING(for working krb5-config)
>   if test -x "$KRB5_CONFIG"; then
>     ac_save_CFLAGS=$CFLAGS
>@@ -2363,32 +2383,6 @@
>   
>   if test x$FOUND_KRB5 = x"no"; then
>     #################################################
>-    # check for location of Kerberos 5 install
>-    AC_MSG_CHECKING(for kerberos 5 install path)
>-    AC_ARG_WITH(krb5,
>-    [  --with-krb5=base-dir    Locate Kerberos 5 support (default=/usr)],
>-    [ case "$withval" in
>-      no)
>-        AC_MSG_RESULT(no krb5-path given)
>-        ;;
>-      yes)
>-        AC_MSG_RESULT(/usr)
>-        FOUND_KRB5=yes
>-        ;;
>-      *)
>-        AC_MSG_RESULT($withval)
>-        KRB5_CFLAGS="-I$withval/include"
>-        KRB5_CPPFLAGS="-I$withval/include"
>-        KRB5_LDFLAGS="-L$withval/lib"
>-        FOUND_KRB5=yes
>-        ;;
>-      esac ],
>-      AC_MSG_RESULT(no krb5-path given)
>-    )
>-  fi
>-
>-  if test x$FOUND_KRB5 = x"no"; then
>-    #################################################
>     # see if this box has the SuSE location for the heimdal krb implementation
>     AC_MSG_CHECKING(for /usr/include/heimdal)
>     if test -d /usr/include/heimdal; then
>@@ -2620,7 +2614,6 @@
>       AC_DEFINE(HAVE_MEMORY_KEYTAB,1,
>                [Whether in-memory keytabs are supported])
>   fi
>-
> 
>   if test x"$ac_cv_lib_ext_krb5_krb5_mk_req_extended" = x"yes"; then
>     AC_DEFINE(HAVE_KRB5,1,[Whether to have KRB5 support])

Actions: View

Attachments on bug 433: 134