File libsoup-2.32.2-windows.patch of Package mingw32-libsoup

Overview Repositories Revisions Requests Users Attributes Meta

File libsoup-2.32.2-windows.patch of Package mingw32-libsoup (Revision 07e60c61114345040c995157ba4a816d)

Currently displaying revision 07e60c61114345040c995157ba4a816d , Show latest

--- libsoup-2.32.2/configure.ac	2010-11-29 23:52:12.000000000 +0100
+++ libsoup-2.32.2/configure.ac	2011-03-08 00:00:24.488106959 +0100
@@ -148,15 +148,17 @@
 	    :, [if test $os_win32 = yes; then with_gnome=no; else with_gnome=yes; fi])
 AC_MSG_RESULT($with_gnome)
 
+with_gnome_keyring=yes
 if test $with_gnome != no; then
 	PKG_CHECK_MODULES(GNOME_KEYRING, gnome-keyring-1, :,
-			  AC_MSG_ERROR(
+			  AC_MSG_WARN(
 [Could not find gnome-keyring devel files.
-Configure with --without-gnome if you wish to build only libsoup
-without GNOME-specific features.]))
+Gnome keyring support will not be available.]))
+with_gnome_keyring=no
 fi
 AC_SUBST(GNOME_KEYRING_CFLAGS)
 AC_SUBST(GNOME_KEYRING_LIBS)
+AM_CONDITIONAL(WITH_GNOME_KEYRING, test $with_gnome_keyring != no)
 
 AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no)
 
--- libsoup-2.32.2/libsoup/Makefile.am	2010-11-23 16:45:20.000000000 +0100
+++ libsoup-2.32.2/libsoup/Makefile.am	2011-03-08 00:08:23.065118139 +0100
@@ -173,6 +173,14 @@
 
 if BUILD_LIBSOUP_GNOME
 
+if WITH_GNOME_KEYRING
+soup_password_manager_gnome_files =	\
+	soup-password-manager-gnome.h	\
+	soup-password-manager-gnome.c
+else
+soup_password_manager_gnome_files =	
+endif
+
 libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
 
 libsoupgnomeinclude_HEADERS =	\
@@ -182,7 +190,7 @@
 
 lib_LTLIBRARIES += libsoup-gnome-2.4.la
 
-libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS)
+libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS) -no-undefined
 
 libsoup_gnome_2_4_la_LIBADD =		\
 	libsoup-2.4.la			\
@@ -197,8 +205,7 @@
 	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

Places

File libsoup-2.32.2-windows.patch of Package mingw32-libsoup (Revision 07e60c61114345040c995157ba4a816d)

Places