[gedit] Fix detection for libsoup on win32 and add it to the build script.

[Ignacio Casal Quinteiro <icq src gnome org>]

commit b4662053efa6f0588c94674584dea5562d51fa95
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Sun Jun 21 15:53:32 2009 +0200

    Fix detection for libsoup on win32 and add it to the build script.

 configure.ac                                    |    6 +++---
 plugins/checkupdate/gedit-check-update-plugin.c |    3 ++-
 win32/build-installer                           |    1 +
 win32/gedit.iss.in                              |    1 +
 4 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5006e26..4db0e7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,7 @@ case "$host" in
   *-*-mingw*|*-*-cygwin*)
     platform_win32=yes
     AC_CHECK_TOOL(WINDRES, windres)
-    ACTIVE_PLUGINS += ",checkupdate"
+    ACTIVE_PLUGINS="${ACTIVE_PLUGINS},checkupdate"
     ;;
   *)
     platform_win32=no
@@ -86,7 +86,7 @@ AC_MSG_CHECKING([for Mac OS X platform])
 case "$host" in
   *-*-darwin*)
     platform_osx=yes
-    ACTIVE_PLUGINS += ",checkupdate"
+    ACTIVE_PLUGINS="${ACTIVE_PLUGINS},checkupdate"
     ;;
   *)
     platform_osx=no
@@ -145,7 +145,7 @@ if test "x$enable_updater" != "xno"; then
 		have_libsoup=yes,
 		have_libsoup=no)
 	
-	if test x"have_libsoup" = "xyes"; then
+	if test "x$have_libsoup" = "xyes"; then
 		if test "x$platform_win32" = "xyes"; then
 			enable_updater=yes
 		elif test "x$platform_osx" = "xyes"; then
diff --git a/plugins/checkupdate/gedit-check-update-plugin.c b/plugins/checkupdate/gedit-check-update-plugin.c
index aaa4bab..6171c6f 100644
--- a/plugins/checkupdate/gedit-check-update-plugin.c
+++ b/plugins/checkupdate/gedit-check-update-plugin.c
@@ -214,7 +214,6 @@ static GtkWidget *
 create_infobar (GeditWindow *window)
 {
 	GtkWidget *infobar;
-	GtkWidget *button;
 
 #if !GTK_CHECK_VERSION (2, 17, 1)
 	infobar = gedit_message_area_new ();
@@ -227,6 +226,8 @@ create_infobar (GeditWindow *window)
 				       GTK_STOCK_CANCEL,
 				       GTK_RESPONSE_CANCEL);
 #else
+	GtkWidget *button;
+
 	infobar = gtk_info_bar_new ();
 	
 	button = gedit_gtk_button_new_with_stock_icon (_("_Download"),
diff --git a/win32/build-installer b/win32/build-installer
index b73b1fc..a5f07ef 100755
--- a/win32/build-installer
+++ b/win32/build-installer
@@ -70,6 +70,7 @@ cp /bin/libgconf-2-4.dll installer/bin || exit
 cp /bin/libgailutil-18.dll installer/bin || exit
 
 cp /bin/libenchant.dll installer/bin || exit
+cp /bin/libsoup-2.4-1.dll installer/bin || exit
 
 echo "Stripping DLL files..."
 strip installer/bin/*.dll || exit
diff --git a/win32/gedit.iss.in b/win32/gedit.iss.in
index 444a72d..9b5f969 100644
--- a/win32/gedit.iss.in
+++ b/win32/gedit.iss.in
@@ -78,6 +78,7 @@ Source: "bin\libgettextpo-0.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libgtksourceview-2.0-0.dll"; DestDir: "{app}\bin"; Components: main
 Source: "lib\GConf\2\*.dll"; DestDir: "{app}\lib\GConf\2"; Components: main
 Source: "bin\libenchant.dll"; DestDir: "{app}\bin"; Components: main
+Source: "bin\libsoup-2.4-1.dll"; DestDir: "{app}\bin"; Components: main
 
 ; Python modules
 ;Source: "bin\python25.dll"; DestDir: "{app}\bin"; Components: python