--- configure.ac	2014-01-13 00:21:39 +0000
+++ configure.ac	2014-01-13 00:48:30 +0000
@@ -236,6 +236,7 @@
 dnl **********************************
 dnl Check for base dependencies early.
 dnl **********************************
+
 PKG_CHECK_MODULES([GNOME_PLATFORM],
 	[gio-2.0 >= glib_minimum_version
 	 gmodule-2.0 >= glib_minimum_version
@@ -244,12 +245,18 @@
 	 gail-3.0 >= gtk_minimum_version
 	 libxml-2.0 >= libxml_minimum_version
 	 shared-mime-info >= shared_mime_info_minimum_version
-	 gnome-desktop-3.0 >= gnome_desktop_minimum_version
 	 gsettings-desktop-schemas >= gsettings_desktop_schemas_minimum_version
 	 webkitgtk-3.0 >= webkitgtk_minimum_version])
 AC_SUBST(GNOME_PLATFORM_CFLAGS)
 AC_SUBST(GNOME_PLATFORM_LIBS)
 
+if test "$os_win32" != "yes"; then
+	PKG_CHECK_MODULES([GNOME_DESKTOP], [gnome-desktop-3.0 >= gnome_desktop_minimum_version])
+	AC_SUBST(GNOME_DESKTOP_CFLAGS)
+	AC_SUBST(GNOME_DESKTOP_LIBS)
+	AC_DEFINE(HAVE_GNOME_DESKTOP, 1, [gnome-desktop])
+fi
+
 dnl Blacklist WebKitGTK+ 1.9.90.
 if $PKG_CONFIG --exact-version "1.9.90" webkitgtk-3.0; then
 	AC_MSG_ERROR([
@@ -562,6 +569,12 @@
 AC_CHECK_FUNCS(statfs)
 
 dnl **************************************************
+dnl wait.h is not available on win32
+dnl **************************************************
+
+AC_CHECK_HEADERS(sys/wait.h, AC_DEFINE(HAVE_SYS_WAIT_H, 1, [Have <sys/wait.h>]))
+
+dnl **************************************************
 dnl Gnome Icon Theme
 dnl **************************************************
 PKG_CHECK_MODULES([GIT], [gnome-icon-theme >= gnome_icon_theme_minimum_version])
@@ -1077,7 +1090,12 @@
 dnl **************
 dnl Calendar Flags
 dnl **************
-PKG_CHECK_MODULES([LIBSOUP], [libsoup-gnome-2.4 >= libsoup_minimum_version])
+if test "$os_win32" = "yes"; then
+	PKG_CHECK_MODULES([LIBSOUP], [libsoup-2.4 >= libsoup_minimum_version])
+else
+	PKG_CHECK_MODULES([LIBSOUP], [libsoup-gnome-2.4 >= libsoup_minimum_version])
+	AC_DEFINE(HAVE_SOUP_GNOME, 1, [libsoup-gnome])
+fi
 AC_SUBST(LIBSOUP_CFLAGS)
 AC_SUBST(LIBSOUP_LIBS)
 
