# HG changeset patch
# User J. Ali Harlow <ali@juiblex.co.uk>
# Date 1231434748 0
# Node ID 636f120d1b5ea98aa33217b2731be1a9ec9aec22
# Parent  52871d4b9265556470de6c217c8d2fef9d701aba
Link to winsock2 under mingw (needed for ntohl).

diff -r 52871d4b9265 -r 636f120d1b5e configure.ac
--- a/configure.ac	Thu Jan 08 16:54:05 2009 +0000
+++ b/configure.ac	Thu Jan 08 17:12:28 2009 +0000
@@ -36,11 +36,13 @@
 case $host_os in
     *mingw*)	AC_DEFINE([MSWIN_API], 1,
 		  [Define to 1 to use Microsoft Windows native API.])
+		EXTRA_LIBS='-lws2_32'
 		mswin_api=yes;;
     *)		mswin_api=no;;
 esac
 AC_MSG_RESULT([$mswin_api])
 AM_CONDITIONAL(MSWIN_API, test "$mswin_api" = "yes")
+AC_SUBST(EXTRA_LIBS)
 
 # Taken from dbus
 AC_ARG_ENABLE(ansi,             [  --enable-ansi           enable -ansi -pedantic gcc flags],enable_ansi=$enableval,enable_ansi=no)
diff -r 52871d4b9265 -r 636f120d1b5e data/razor.pc.in
--- a/data/razor.pc.in	Thu Jan 08 16:54:05 2009 +0000
+++ b/data/razor.pc.in	Thu Jan 08 17:12:28 2009 +0000
@@ -7,6 +7,6 @@
 Description: library for depsolving, installing and removing packages
 Version: @VERSION@
 Requires: libcurl
-Libs: -L${libdir} -lexpat -lz -lrazor
+Libs: -L${libdir} -lexpat -lz -lrazor @EXTRA_LIBS@
 Cflags: -I${includedir}/razor
 
diff -r 52871d4b9265 -r 636f120d1b5e librazor/Makefile.am
--- a/librazor/Makefile.am	Thu Jan 08 16:54:05 2009 +0000
+++ b/librazor/Makefile.am	Thu Jan 08 17:12:28 2009 +0000
@@ -31,7 +31,7 @@
 	merger.c					\
 	transaction.c
 
-librazor_la_LIBADD = $(ZLIB_LIBS) ../gl/libgnu.la
+librazor_la_LIBADD = $(ZLIB_LIBS) ../gl/libgnu.la $(EXTRA_LIBS)
 
 clean-local :
 	rm -f *~
diff -r 52871d4b9265 -r 636f120d1b5e librazor/rpm.c
--- a/librazor/rpm.c	Thu Jan 08 16:54:05 2009 +0000
+++ b/librazor/rpm.c	Thu Jan 08 17:12:28 2009 +0000
@@ -33,7 +33,7 @@
 #include <dirent.h>
 #include <unistd.h>
 #if MSWIN_API
-#include <winsock.h>	/* For ntohl() */
+#include <winsock2.h>	/* For ntohl() */
 #else
 #include <arpa/inet.h>
 #endif
diff -r 52871d4b9265 -r 636f120d1b5e src/Makefile.am
--- a/src/Makefile.am	Thu Jan 08 16:54:05 2009 +0000
+++ b/src/Makefile.am	Thu Jan 08 17:12:28 2009 +0000
@@ -22,13 +22,13 @@
 if HAVE_RPMLIB
 razor_SOURCES += import-rpmdb.c
 endif
-razor_LDADD = $(RPM_LIBS) $(EXPAT_LIBS) $(CURL_LIBS) $(top_builddir)/librazor/librazor.la $(top_builddir)/gl/libgnu.la
+razor_LDADD = $(RPM_LIBS) $(EXPAT_LIBS) $(CURL_LIBS) $(top_builddir)/librazor/librazor.la $(top_builddir)/gl/libgnu.la $(EXTRA_LIBS)
 
 rpm_SOURCES = rpm.c
-rpm_LDADD = $(top_builddir)/librazor/librazor.la
+rpm_LDADD = $(top_builddir)/librazor/librazor.la $(EXTRA_LIBS)
 
 test_driver_SOURCES = test-driver.c
-test_driver_LDADD = $(EXPAT_LIBS) $(top_builddir)/librazor/librazor.la
+test_driver_LDADD = $(EXPAT_LIBS) $(top_builddir)/librazor/librazor.la $(EXTRA_LIBS)
 
 TESTS = test-driver