cross-compiler changes

2 files changed, 7 insertions, 3 deletions

diff --git a/configure.ac b/configure.ac
index b5b957212..3e45ddaa5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_CONFIG_HEADERS([gnunet_config.h])
 AH_TOP([#define _GNU_SOURCE  1])
 
 # Checks for programs.
-AC_CANONICAL_HOST
+AC_CANONICAL_SYSTEM
 AC_PROG_AWK
 AC_PROG_CC
 gl_EARLY
@@ -193,6 +193,8 @@ then
   AC_MSG_ERROR([GNUnet needs libgcrypt])
 fi
 
+if test $build = $target
+then
 AC_MSG_CHECKING([for working HMAC])
 AC_LANG_PUSH(C)
 LIBS="$LIBS $LIBGCRYPT_LIBS"
@@ -247,6 +249,8 @@ LIBCURL_CHECK_CONFIG(,7.20.1,,AC_MSG_ERROR([GNUnet requires libcurl >= 7.20.1]))
 # restore LIBS
 LIBS=$SAVE_LIBS
 
+fi      # $build = $target
+
 # glpk
 #AC_CHECK_HEADERS(glpk.h, glpk=true)
 #AM_CONDITIONAL(HAVE_GLPK, test x$glpk = xtrue)
diff --git a/src/include/winproc.h b/src/include/winproc.h
index 595180a96..a29130e66 100644
--- a/src/include/winproc.h
+++ b/src/include/winproc.h
@@ -42,9 +42,9 @@
 #include <shlobj.h>
 #include <objbase.h>
 #include <sys/param.h>          /* #define BYTE_ORDER */
-#include <Ntsecapi.h>
+#include <ntsecapi.h>
 #include <lm.h>
-#include <Aclapi.h>
+#include <aclapi.h>
 
 
 #ifdef __cplusplus