Pasted

diff --git a/configure.ac b/configure.ac
index 85559d7f7..bc9575719 100644
--- a/configure.ac
+++ b/configure.ac
@@ -428,20 +428,6 @@ if test x$enable_android_apk = xno -a x$enable_exult = xyes; then
    PKG_CHECK_MODULES(OGG, ogg >= 1.0 vorbis >= 1.0.1 vorbisfile, , AC_MSG_ERROR([*** must have Ogg/Vorbis installed!]))
 fi
 
-# ---------------------------------------------------------------------
-# Icu (for ES)
-# ---------------------------------------------------------------------
-
-if test x$enable_android_apk = xno; then
-   PKG_CHECK_MODULES(ICU, icu-uc, have_icu=yes, have_icu=no)
-fi
-
-# ---------------------------------------------------------------------
-# Gtk (for ES)
-# ---------------------------------------------------------------------
-
-PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.16, have_gtk=yes, have_gtk=no)
-
 # ---------------------------------------------------------------------
 # Gdk-Pixbuf (for Gnome shp thumbnailer)
 # ---------------------------------------------------------------------
@@ -589,7 +575,6 @@ fi
 
 
 # zipped savegame support
-
 AC_ARG_ENABLE(zip-support, AS_HELP_STRING([--enable-zip-support], [Enable zipped savegame support @<:@default yes@:>@]),,enable_zip_support=yes)
 
 if test x$enable_zip_support = xyes ; then
@@ -668,7 +653,6 @@ else
 fi
 
 # Midi Sfx
-
 AC_ARG_ENABLE(midi-sfx, AS_HELP_STRING([--enable-midi-sfx], [Support for Midi Sfx (sounds horrible) @<:@default no@:>@]),,enable_midi_sfx=no)
 AC_MSG_CHECKING([whether to enable midi sfx])
 if test x$enable_midi_sfx = xyes; then
@@ -679,8 +663,58 @@ else
 fi
 
 # ---------------------------------------------------------------------
-# support for Exult Studio
+# Exult Studio
 # ---------------------------------------------------------------------
+
+AC_ARG_ENABLE(exult-studio, AS_HELP_STRING([--enable-exult-studio], [Build Exult Studio @<:@default no@:>@]),,enable_exult_studio=no)
+AC_MSG_CHECKING([whether to build Exult Studio])
+
+if test x$enable_android_apk = xno -a x$enable_exult_studio = xyes; then
+# Icu
+   PKG_CHECK_MODULES(ICU, icu-uc, have_icu=yes, have_icu=no)
+# Gtk
+   PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.16, have_gtk=yes, have_gtk=no)
+# Freetype2 (optional, used in ExultStudio, shapes/fontgen.cc)
+   AC_PATH_PROG(FT2CONFIG, freetype-config)
+   if test -n "$FT2CONFIG"; then
+       FREETYPE2_LIBS=`$FT2CONFIG --libs`
+       SAVED_LDFLAGS="$LDFLAGS"
+       LDFLAGS="$LDFLAGS $FREETYPE2_LIBS"
+       AC_CHECK_FUNC(FT_Init_FreeType, have_freetype=yes, have_freetype=no)
+       LDFLAGS="$SAVED_LDFLAGS"
+       FREETYPE2_INCLUDES=`$FT2CONFIG --cflags`
+       if test x$have_freetype = xyes; then
+           AC_DEFINE(HAVE_FREETYPE2, 1, [Have freetype2])
+       else
+           FREETYPE2_LIBS=
+           FREETYPE2_INCLUDES=
+       fi
+       AC_SUBST(FREETYPE2_LIBS)
+       AC_SUBST(FREETYPE2_INCLUDES)
+   fi
+fi
+
+# Exult Studio
+if test x$enable_exult_studio = xyes; then
+   AC_MSG_RESULT(yes)
+   if test x$have_gtk = xno; then
+       echo "Exult Studio requires the GTK+ (aka the GIMP Tool Kit), but it is not installed."
+       echo "Please try again, either with the GTK+ installed as 3.16 or newer, or with '--disable-exult-studio'."
+       exit 1
+   fi
+   if test x$have_icu = xno; then
+       echo "Exult Studio requires the ICU (aka the International Components for Unicode), but it is not installed."
+       echo "Please try again, either with the ICU installed, or with '--disable-exult-studio'."
+       exit 1
+   fi
+   AM_CONDITIONAL(BUILD_STUDIO, true)
+   AM_CONDITIONAL(BUILD_SHAPES, true)
+else
+   AM_CONDITIONAL(BUILD_STUDIO, false)
+   AC_MSG_RESULT(no)
+fi
+
+# support for Exult Studio
 AC_MSG_CHECKING([whether to enable support for Exult Studio])
 AC_ARG_ENABLE(exult-studio-support, AS_HELP_STRING([--enable-exult-studio-support], [Enable ExultStudio support @<:@default no@:>@]),,enable_exult_studio_support=no)
 if test "$WINDOWING_SYSTEM" != -DXWIN -a "$WINDOWING_SYSTEM" != -D_WIN32 -a "$WINDOWING_SYSTEM" != -DMACOSX; then
@@ -692,6 +726,10 @@ if test "$WINDOWING_SYSTEM" != -DMACOSX; then
    enable_macosx_x11_studio_support=no
 fi
 
+if test x$enable_exult_studio = xyes; then
+   enable_exult_studio_support=yes
+fi
+
 if test x$enable_exult_studio_support = xyes ; then
    AC_MSG_RESULT(yes)
    AC_DEFINE(USE_EXULTSTUDIO, 1, [Use Exult Studio])
@@ -1035,47 +1073,6 @@ else
    AC_MSG_RESULT(yes)
 fi
 
-# Freetype2 (optional, used in ExultStudio, shapes/fontgen.cc)
-AC_PATH_PROG(FT2CONFIG, freetype-config)
-if test -n "$FT2CONFIG"; then
-   FREETYPE2_LIBS=`$FT2CONFIG --libs`
-   SAVED_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $FREETYPE2_LIBS"
-   AC_CHECK_FUNC(FT_Init_FreeType, have_freetype=yes, have_freetype=no)
-   LDFLAGS="$SAVED_LDFLAGS"
-   FREETYPE2_INCLUDES=`$FT2CONFIG --cflags`
-   if test x$have_freetype = xyes; then
-       AC_DEFINE(HAVE_FREETYPE2, 1, [Have freetype2])
-   else
-       FREETYPE2_LIBS=
-       FREETYPE2_INCLUDES=
-   fi
-   AC_SUBST(FREETYPE2_LIBS)
-   AC_SUBST(FREETYPE2_INCLUDES)
-fi
-
-# exult-studio
-AC_ARG_ENABLE(exult-studio, AS_HELP_STRING([--enable-exult-studio], [Build Exult Studio @<:@default no@:>@]),,enable_exult_studio=no)
-AC_MSG_CHECKING([whether to build Exult Studio])
-if test x$enable_exult_studio = xyes; then
-   AC_MSG_RESULT(yes)
-   if test x$have_gtk = xno; then
-       echo "Exult Studio requires the GTK+ (aka the GIMP Tool Kit), but it is not installed."
-       echo "Please try again, either with the GTK+ installed as 3.16 or newer, or with '--disable-exult-studio'."
-       exit 1
-   fi
-   if test x$have_icu = xno; then
-       echo "Exult Studio requires the ICU (aka the International Components for Unicode), but it is not installed."
-       echo "Please try again, either with the ICU installed, or with '--disable-exult-studio'."
-       exit 1
-   fi
-   AM_CONDITIONAL(BUILD_STUDIO, true)
-   AM_CONDITIONAL(BUILD_SHAPES, true)
-else
-   AM_CONDITIONAL(BUILD_STUDIO, false)
-   AC_MSG_RESULT(no)
-fi
-
 # Usecode debugger
 AC_ARG_WITH([usecode-debugger],
             AS_HELP_STRING([--with-usecode-debugger=no|console|yes],
@@ -1324,14 +1321,14 @@ if test x$enable_android_apk = xno; then
        PKG_CHECK_EXISTS(zlib,
            echo zlib....................... : `$PKG_CONFIG --modversion zlib`)
    fi
-   if test x$have_icu = xyes; then
+   if test x$enable_exult_studio = xyes; then
        echo ICU........................ : `$PKG_CONFIG --modversion icu-uc`
    fi
-   if test x$have_gtk = xyes; then
+   if test x$enable_exult_studio = xyes; then
        echo GLIB....................... : `$PKG_CONFIG --modversion glib-2.0`
        echo GTK+....................... : `$PKG_CONFIG --modversion gtk+-3.0`
    fi
-   if test x$have_gdk_pixbuf = xyes; then
+   if test x$have_gdk_pixbuf = xyes -a x$enable_gimp_plugin = xyes; then
        echo GDK-Pixbuf................. : `$PKG_CONFIG --modversion gdk-pixbuf-2.0`
    fi
    echo