more mingw fixes

configure.in

@@ -74,6 +74,7 @@ esac
 AM_CONDITIONAL(FLaC__CPU_IA32, test "x$cpu_ia32" = xtrue)
 AM_CONDITIONAL(FLaC__CPU_PPC, test "x$cpu_ppc" = xtrue)
 AM_CONDITIONAL(FLaC__CPU_SPARC, test "x$cpu_sparc" = xtrue)
+
 case "$host" in
 	i386-*-openbsd3.[[0-3]]) OBJ_FORMAT=aoutb ;;
 	*-*-cygwin|*mingw*) OBJ_FORMAT=win32 ;;
@@ -81,6 +82,14 @@ case "$host" in
 	*) OBJ_FORMAT=elf ;;
 esac
 AC_SUBST(OBJ_FORMAT)
+
+# only needed because of ntohl() usage, can get rid of after that's gone:
+case "$host" in
+	*-*-cygwin|*mingw*) MINGW_WINSOCK_LIBS=-lwsock32 ;;
+	*) MINGW_WINSOCK_LIBS= ;;
+esac
+AC_SUBST(MINGW_WINSOCK_LIBS)
+
 case "$host" in
 	*-pc-linux-gnu)
 		sys_linux=true

src/flac/Makefile.am

@@ -48,4 +48,5 @@ flac_LDADD = \
 	$(top_builddir)/src/libFLAC/libFLAC.la \
 	@OGG_LIBS@ \
 	@LIBICONV@ \
+	@MINGW_WINSOCK_LIBS@ \
 	-lm

src/metaflac/Makefile.am

@@ -49,4 +49,5 @@ metaflac_LDADD = \
 	$(top_builddir)/src/libFLAC/libFLAC.la \
 	@OGG_LIBS@ \
 	@LIBICONV@ \
+	@MINGW_WINSOCK_LIBS@ \
 	-lm

src/test_libFLAC++/Makefile.am

@@ -28,6 +28,7 @@ test_libFLAC___LDADD = \
 	$(top_builddir)/src/libFLAC++/libFLAC++.la \
 	$(top_builddir)/src/libFLAC/libFLAC.la \
 	@OGG_LIBS@ \
+	@MINGW_WINSOCK_LIBS@ \
 	-lm
 test_libFLAC___SOURCES = \
 	decoders.cpp \

src/test_libFLAC/Makefile.am

@@ -29,6 +29,7 @@ test_libFLAC_LDADD = \
 	$(top_builddir)/src/test_libs_common/libtest_libs_common.la \
 	$(top_builddir)/src/libFLAC/libFLAC.la \
 	@OGG_LIBS@ \
+	@MINGW_WINSOCK_LIBS@ \
 	-lm
 test_libFLAC_SOURCES = \
 	bitwriter.c \

src/test_seeking/Makefile.am

@@ -28,6 +28,7 @@ noinst_PROGRAMS = test_seeking
 test_seeking_LDADD = \
 	$(top_builddir)/src/libFLAC/libFLAC.la \
 	@OGG_LIBS@ \
+	@MINGW_WINSOCK_LIBS@ \
 	-lm
 test_seeking_SOURCES = \
 	main.c