Update krb5 library detection and make variables for windows

Currently works for mit-krb5, 32-bit.

diff --git a/acinclude.m4 b/acinclude.m4
index 9da57ed..4c2d062 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -19,22 +19,28 @@ AC_ARG_WITH(krb5,
     [check_krb5_dir=])
 for dir in $check_krb5_dir $prefix /usr/local /usr ; do
    krb5dir="$dir"
-   if test -x "$dir/bin/krb5-config"; then
-     found_krb5="yes";
-     if test "x$target_windows" = "xyes"; then
-        KRB5_CFLAGS=-I"$check_krb5_dir/include";
-        KRB5_LDFLAGS="-L$check_krb5_dir/lib/";
-        KRB5_LIBS="-lkrb5_32 -lgssapi32";
-        COMPILE_ET="$check_krb5_dir/bin/compile_et";
-       AC_MSG_RESULT([yes])
-     else
+   if test "x$target_windows" = "xyes"; then
+      krb5includedir="$dir/include";
+      if test -e "$krb5includedir/krb5.h"; then
+        found_krb5="yes";
+        krb5libdir="$dir/lib/i386"
+        KRB5_CFLAGS=-I"$krb5includedir";
+        KRB5_LDFLAGS=-L"$krb5libdir";
+        KRB5_LIBS="$krb5libdir/krb5_32.lib $krb5libdir/gssapi32.lib $krb5libdir/comerr32.lib";
+        COMPILE_ET="$(pwd)/build-aux/compile_et";
+        AC_MSG_RESULT([yes])
+        break;
+     fi
+   else
+      if test -x "$dir/bin/krb5-config"; then
+        found_krb5="yes";
         KRB5_CFLAGS=`$dir/bin/krb5-config gssapi --cflags`;
         KRB5_LDFLAGS="-L$dir/lib";
         KRB5_LIBS=`$dir/bin/krb5-config gssapi --libs`
-AC_MSG_RESULT([yes])
+        AC_MSG_RESULT([yes])
         AC_PATH_PROG(COMPILE_ET, [compile_et], [compile_et], [$dir/bin$PATH_SEPARATOr])
+        break;
      fi
-     break;
    fi
 done
 if test x_$found_krb5 != x_yes; then
@@ -282,7 +288,11 @@ if test x_$found_openssl != x_yes; then
 ])
 else
        printf "OpenSSL found in $openssldir\n";
-       OPENSSL_LIBS="-lssl -lcrypto";
+    if test "x$target_windows" = "xyes"; then
+      OPENSSL_LIBS="$openssldir/lib/libeay32.lib $openssldir/lib/ssleay32.lib";
+    else
+         OPENSSL_LIBS="-lssl -lcrypto";
+       fi
        OPENSSL_LDFLAGS="-L$openssldir/lib";
        AC_SUBST(OPENSSL_CFLAGS)
        AC_SUBST(OPENSSL_LDFLAGS)