From: Sam Hartman <hartmans@painless-security.com>
Date: Fri, 16 Sep 2011 15:13:03 +0000 (+0100)
Subject: configure: support krb5 --with-system-et
X-Git-Tag: tr-beta1~89^2~6
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=moonshot.git;a=commitdiff_plain;h=362aaed4308d7e20b191a7e228f9b77bf28bfc46

configure: support krb5 --with-system-et

If the system et and compile_et are used, then compile_et may not be
in the krb5 directory; support this.
---

diff --git a/moonshot/acinclude.m4 b/moonshot/acinclude.m4
index ea542db..a626e8a 100644
--- a/moonshot/acinclude.m4
+++ b/moonshot/acinclude.m4
@@ -25,16 +25,18 @@ for dir in $check_krb5_dir $prefix /usr /usr/local ; do
         KRB5_CFLAGS=-I"$check_krb5_dir/include";
         KRB5_LIBS="-L$check_krb5_dir/lib/ -lkrb5_32 -lgssapi32";
         COMPILE_ET="$check_krb5_dir/bin/compile_et";
+	AC_MSG_RESULT([yes])
      else
         KRB5_CFLAGS=`$dir/bin/krb5-config gssapi --cflags`;
-        KRB5_LIBS=`$dir/bin/krb5-config gssapi --libs`;
-        COMPILE_ET="$dir/bin/compile_et";
+        KRB5_LIBS=`$dir/bin/krb5-config gssapi --libs`
+AC_MSG_RESULT([yes])
+        AC_PATH_PROG(COMPILE_ET, [compile_et], [compile_et], [$dir/bin$PATH_SEPARATOr])
      fi
      break;
    fi
 done
-AC_MSG_RESULT($found_krb5)
 if test x_$found_krb5 != x_yes; then
+   AC_MSG_RESULT($found_krb5)
    AC_MSG_ERROR([
 ----------------------------------------------------------------------
   Cannot find GSS-API/Kerberos libraries.