Fix libmoonshot detection and linking on windows

diff --git a/acinclude.m4 b/acinclude.m4
index 4f1d154..2ef0e06 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -389,20 +389,25 @@ AC_ARG_WITH(libmoonshot,
     [check_libmoonshot_dir="$withval"],
     [check_libmoonshot_dir=])
 for dir in $check_libmoonshot_dir $prefix /usr /usr/local ; do
-   libmoonshotdir="$dir"
-   if test -f "$dir/include/libmoonshot.h"; then
-     found_libmoonshot="yes";
-     LIBMOONSHOT_DIR="${libmoonshotdir}"
-     LIBMOONSHOT_CFLAGS="-I$libmoonshotdir/include";
-     break;
-   fi
+    libmoonshotdir="$dir"
+    if test -f "$dir/include/libmoonshot.h"; then
+        found_libmoonshot="yes";
+        LIBMOONSHOT_CFLAGS="-I$libmoonshotdir/include";
+        break;
+    fi
 done
 AC_MSG_RESULT($found_libmoonshot)
 if test x_$found_libmoonshot = x_yes; then
     printf "libmoonshot found in $libmoonshotdir\n";
-    LIBMOONSHOT_LIBS="-lmoonshot";
-    LIBMOONSHOT_LDFLAGS="-L$libmoonshot/lib";
-    AC_CHECK_LIB(moonshot, moonshot_get_identity, [AC_DEFINE_UNQUOTED([HAVE_MOONSHOT_GET_IDENTITY], 1, [Define if Moonshot identity selector is available])], [], "$LIBMOONSHOT_LIBS")
+    LIBMOONSHOT_DIR="${libmoonshotdir}"
+    if test x_$target_windows = x_yes; then
+        LIBMOONSHOT_LIBS="$LIBMOONSHOT_DIR/lib/libmoonshot.lib"
+        AC_DEFINE_UNQUOTED([HAVE_MOONSHOT_GET_IDENTITY], 1, [Define if Moonshot identity selector is available])          
+    else
+        LIBMOONSHOT_LIBS="-lmoonshot";
+        LIBMOONSHOT_LDFLAGS="-L$libmoonshot/lib";
+        AC_CHECK_LIB(moonshot, moonshot_get_identity, [AC_DEFINE_UNQUOTED([HAVE_MOONSHOT_GET_IDENTITY], 1, [Define if Moonshot identity selector is available])], [], "$LIBMOONSHOT_LIBS")
+    fi
 fi
     AC_SUBST(LIBMOONSHOT_CFLAGS)
     AC_SUBST(LIBMOONSHOT_LDFLAGS)