Build relevant parts of libsoup-gnome on windows

diff --git a/configure.ac b/configure.ac
index ec826a4..ac8a7bf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -115,7 +115,7 @@ AC_ARG_WITH(gnome,
            :, [if test $os_win32 = yes; then with_gnome=no; else with_gnome=yes; fi])
 AC_MSG_RESULT($with_gnome)
 
-if test $with_gnome != no; then
+if test $with_gnome != no -a $os_win32 != yes; then
        PKG_CHECK_MODULES(GNOME_KEYRING, gnome-keyring-1, :,
                          AC_MSG_ERROR(
 [Could not find gnome-keyring devel files.

diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
index 14fd692..5b9329c 100644 (file)
--- a/libsoup/Makefile.am
+++ b/libsoup/Makefile.am
@@ -181,6 +181,14 @@ libsoup_2_4_la_SOURCES =           \
 
 if BUILD_LIBSOUP_GNOME
 
+if OS_WIN32
+soup_password_manager_gnome_files =    
+else
+soup_password_manager_gnome_files =    \
+       soup-password-manager-gnome.h   \
+       soup-password-manager-gnome.c
+endif
+
 libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
 
 libsoupgnomeinclude_HEADERS =  \
@@ -203,8 +211,7 @@ libsoup_gnome_2_4_la_SOURCES =              \
        soup-gnome-features.c           \
        soup-proxy-resolver-gnome.h     \
        soup-proxy-resolver-gnome.c     \
-       soup-password-manager-gnome.h   \
-       soup-password-manager-gnome.c
+       $(soup_password_manager_gnome_files)
 
 endif
 

diff --git a/libsoup/soup-gnome-features.h b/libsoup/soup-gnome-features.h
index 8090978..84d6459 100644 (file)
--- a/libsoup/soup-gnome-features.h
+++ b/libsoup/soup-gnome-features.h
@@ -16,10 +16,12 @@ GType soup_proxy_resolver_gnome_get_type (void);
 GType soup_gnome_features_2_26_get_type (void);
 #define SOUP_TYPE_GNOME_FEATURES_2_26 (soup_gnome_features_2_26_get_type ())
 
+#ifndef G_OS_WIN32
 #ifdef LIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY
 GType soup_password_manager_gnome_get_type (void);
 #define SOUP_TYPE_PASSWORD_MANAGER_GNOME (soup_password_manager_gnome_get_type ())
 #endif /* LIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY */
+#endif
 
 G_END_DECLS