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

parent 1f9ed3a1
......@@ -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
......
......@@ -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"),
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment