libextractor

commit 6c673c55b78cae1137324e192be378f20d03f951
parent ffbfc284e574b37c4680f6da9afb1489e35d4eff
Author: Christian Grothoff <christian@grothoff.org>
Date:   Mon, 28 Nov 2011 16:16:12 +0000

improved w32 winsock detection

Diffstat:
M
ChangeLog
 | 
3
+++
M
configure.ac
 | 
8
+++++++-

2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+Mon Nov 28 17:15:59 CET 2011
+	Improved winsock2 detection. -LRN
+
 Mon Nov 28 12:17:42 CET 2011
 	Fixing compiler warnings, cleaning up ASF plugin.  Finishing
 	Matroska plugin. -CG
diff --git a/configure.ac b/configure.ac
@@ -93,7 +93,13 @@ mingw*)
      AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system])
      AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system])
      AC_CHECK_LIB(intl, gettext)
-     AC_CHECK_LIB(ws2_32, _head_libws2_32_a,,[AC_MSG_ERROR([libextractor requires Winsock2])])
+     mingw32_ws2=yes
+     mingw64_ws2=yes
+     AC_CHECK_LIB(ws2_32, _head_libws2_32_a,,mingw32_ws2=no)
+     AC_CHECK_LIB(ws2_32, __imp_socket,,mingw64_ws2=no)
+     if test "x$mingw32_ws2" = "xno" -a "x$mingw64_ws2" = "xno"; then
+       AC_MSG_ERROR([libextractor requires Winsock2])
+     fi
      AC_CHECK_LIB(plibc, plibc_init,,[AC_MSG_ERROR([libextractor requires PlibC])])
      LDFLAGS="$LDFLAGS -Wl,-no-undefined -Wl,--export-all-symbols"
 		 LIBSOLD=$LIBS