From 1dd6a66ea92477803b6d7959e55707251ba29519 Mon Sep 17 00:00:00 2001
From: Siraj Razick <siraj.razick@collabora.co.uk>
Date: Mon, 12 Mar 2012 19:47:22 -0400
Subject: build: Use gio-windows-2.0 when cross compiling

The current windows build fails since we are unconditionally looking
for gio-unix-2.0, when building for windows we should look for
gio-windows-2.0, and then export the flags accordingly.
---
 src/Makefile.am | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 4210f9e8..43dd959a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -226,15 +226,10 @@ AM_CFLAGS = \
 	@LIBSOUP_CFLAGS@ \
 	$(NULL)
 
-if OS_WINDOWS
-  AM_CFLAGS += -D_WIN32_WINNT=0x0501
-endif
-
 AM_LDFLAGS = \
 	$(GCOV_LIBS) \
 	@LIBXML2_LIBS@ \
 	@GLIB_LIBS@ \
-	@GIO_UNIX_CFLAGS@ \
 	@GMODULE_LIBS@ \
 	@WOCKY_LIBS@ \
 	@DBUS_LIBS@ \
@@ -243,6 +238,15 @@ AM_LDFLAGS = \
 	@LIBSOUP_LIBS@ \
 	$(NULL)
 
+if OS_WINDOWS
+  AM_CFLAGS += -D_WIN32_WINNT=0x0501 \
+      @GIO_WINDOWS_CFLAGS@
+  AM_LDFLAGS += @GIO_WINDOWS_LIBS@
+else
+  AM_CFLAGS += @GIO_UNIX_CFLAGS@
+  AM_LDFLAGS += @GIO_UNIX_LIBS@
+endif
+
 if USE_BACKEND_AVAHI
   AM_LDFLAGS += @AVAHI_LIBS@
   AM_CFLAGS += @AVAHI_CFLAGS@
-- 
cgit v1.2.1