Merge pull request #121 from WinterMute/64bit_win_fix

[fw/stlink] / configure.ac

diff --git a/configure.ac b/configure.ac
index a19bba4f1a366f9d37b115352098c2e3805c1472..e8923ed364a65dd2952e76159aefa2377dc00207 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT([stlink],[0.5.1],[davem@devkitpro.org])
+AC_INIT([stlink],[0.5.6],[davem@devkitpro.org])
 AC_CONFIG_SRCDIR([src/stlink-common.c])
 AC_CONFIG_LIBOBJ_DIR([src])
 AM_INIT_AUTOMAKE([1.10])
@@ -14,12 +14,11 @@ AC_PROG_INSTALL
 AC_CANONICAL_HOST
 AC_CANONICAL_BUILD
 AC_PROG_RANLIB
-#AC_PROG_LIBTOOL
 AM_PROG_CC_C_O
 
 AC_CHECK_HEADERS(sys/mman.h)
-AC_CHECK_FUNCS(mmap)
-AC_REPLACE_FUNCS(mmap pread)
+AC_CHECK_HEADERS(sys/poll.h)
+AC_REPLACE_FUNCS(mmap)
 
 # Checks for libraries.
 PKG_CHECK_MODULES(USB, libusb-1.0 >= 1.0.0,,
@@ -29,6 +28,12 @@ AC_CHECK_LIB([usbpath],[usb_path2devnum],,,-lusb)
 LIBS="$LIBS $USB_LIBS"
 CFLAGS="$CFLAGS $USB_CFLAGS"
 
+case "${host}" in
+       *-mingw32*)
+               LIBS="$LIBS -lws2_32"
+               CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1 $CPPFLAGS"
+       ;;
+esac
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT