diff -r 4da45725031f -r 2b9f54d14cc2 configure.ac
--- a/configure.ac	Fri Mar 23 20:29:24 2012 +0000
+++ b/configure.ac	Sat Nov 15 19:04:45 2014 +0000
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([plover],[0.4.3],[ali@juiblex.co.uk])
+AC_INIT([plover],[0.4.50],[ali@juiblex.co.uk])
 AC_PREREQ(2.59)
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_SRCDIR([plover/plover.h])
@@ -15,14 +15,18 @@
 setup/resources.rc
 update/Makefile
 update/resources.rc
+pre-inst/Makefile
+pre-inst/resources.rc
 app-manager/Makefile
 app-manager/resources.rc
 ])
 PLOVER_MSWIN_MANIFEST([setup/setup.exe.manifest:setup/manifest.xml.in
 update/update.exe.manifest:update/manifest.xml.in
+pre-inst/pre-inst.exe.manifest:pre-inst/manifest.xml.in
 app-manager/app-manager.exe.manifest:app-manager/manifest.xml.in
 ])
 AM_INIT_AUTOMAKE(no-define)
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 case $VERSION in
   *.*.*)
     AC_SUBST(PLOVER_MAJOR_VERSION,[[`echo $VERSION | sed 's/\..*//'`]])
@@ -44,6 +48,15 @@
 AC_CANONICAL_HOST
 AC_SUBST(HOST_OS,$host_os)
 AC_SUBST(HOST_CPU,$host_cpu)
+case $host_os in
+    mingw*)
+	host_mingw="yes"
+	;;
+    *)
+	host_mingw=""
+	;;
+esac
+AM_CONDITIONAL(PLOVER_MINGW,[test -n "$host_mingw"])
 
 # libtool versioning for libplover. For a release one of the following
 # must apply:
@@ -54,7 +67,7 @@
 #   increment CURRENT and set AGE and REVISION to 0.
 # - If the interface is the same as the previous version, increment REVISION.
 #
-lt_current=2
+lt_current=3
 lt_revision=0
 lt_age=0
 LIBPLOVER_LT_VERSION_INFO="$lt_current:$lt_revision:$lt_age"
@@ -93,32 +106,44 @@
 ##################################################
 # Checks for libraries.
 ##################################################
+PKG_CHECK_MODULES(WHELK,[whelk])
 PKG_CHECK_MODULES(RAZOR,[razor >= 0.5.4],[:],[RAZOR_LIBS=-lrazor])
 PKG_CHECK_MODULES(EXPAT,[expat],[:],[EXPAT_LIBS=-lexpat])
 PKG_CHECK_MODULES(ZLIB,[zlib],[:],[ZLIB_LIBS=-lz])
 PKG_CHECK_MODULES(GIO,[gio-2.0])
 PKG_CHECK_MODULES(GTK,[gtk+-2.0])
 PKG_CHECK_MODULES(GMODULE_EXPORT,[gmodule-export-2.0])
-LIBPLOVER_CFLAGS="$RAZOR_CFLAGS $EXPAT_CFLAGS $ZLIB_CFLAGS"
-LIBPLOVER_LIBS="$RAZOR_LIBS $EXPAT_LIBS $ZLIB_LIBS"
+LIBPLOVER_CFLAGS="$RAZOR_CFLAGS $EXPAT_CFLAGS $ZLIB_CFLAGS $GIO_CFLAGS"
+LIBPLOVER_LIBS="$RAZOR_LIBS $EXPAT_LIBS $ZLIB_LIBS $GIO_LIBS"
 AC_SUBST(LIBPLOVER_CFLAGS)
 AC_SUBST(LIBPLOVER_LIBS)
 PLOVER_GTK_CFLAGS="$GTK_CFLAGS $RAZOR_CFLAGS"
 PLOVER_GTK_LIBS="$GTK_LIBS $RAZOR_LIBS"
 AC_SUBST(PLOVER_GTK_CFLAGS)
 AC_SUBST(PLOVER_GTK_LIBS)
-GUI_CFLAGS="$GMODULE_EXPORT_CFLAGS $GIO_CFLAGS $PLOVER_GTK_CFLAGS $LIBPLOVER_CFLAGS"
-GUI_LIBS="$GMODULE_EXPORT_LIBS $GIO_LIBS $PLOVER_GTK_LIBS $LIBPLOVER_LIBS"
+save_LIBS="$LIBS"
+AC_SEARCH_LIBS([crypt],[crypt])
+GUI_CFLAGS="$GMODULE_EXPORT_CFLAGS $WHELK_CFLAGS $PLOVER_GTK_CFLAGS \
+  $LIBPLOVER_CFLAGS"
+GUI_LIBS="-llua-posix $GMODULE_EXPORT_LIBS $WHELK_LIBS $PLOVER_GTK_LIBS \
+  $LIBPLOVER_LIBS $LIBS"
+LIBS="$save_LIBS"
 AC_SUBST(GUI_CFLAGS)
 AC_SUBST(GUI_LIBS)
 save_PKG_CONFIG="$PKG_CONFIG"
 PKG_CONFIG="$PKG_CONFIG --static"
-PKG_CHECK_MODULES(SETUP,[whelk])
+PKG_CHECK_MODULES(SETUP,[whelk razor >= 0.5.4 expat zlib gio-2.0])
+if test -n "$host_mingw"; then
+    # Hack: -liconv is required for mingw. This probably stems from our use of
+    # libiconv rather than win-iconv that Fedora uses, but should be addressed
+    # somewhere in the stack below us.
+    SETUP_LIBS="$SETUP_LIBS -liconv"
+fi
 PKG_CONFIG="$save_PKG_CONFIG"
 save_LIBS="$LIBS"
 AC_SEARCH_LIBS([crypt],[crypt])
-SETUP_LIBS="-llua-posix $SETUP_LIBS $RAZOR_LIBS $LIBS"
-SETUP_CFLAGS="$SETUP_CFLAGS $RAZOR_CFLAGS"
+SETUP_LIBS="-llua-posix $SETUP_LIBS $LIBS"
+SETUP_CFLAGS="$SETUP_CFLAGS"
 AC_SUBST(SETUP_LIBS)
 AC_SUBST(SETUP_CFLAGS)
 LIBS="$save_LIBS"
@@ -139,7 +164,7 @@
 ##################################################
 # Checks for library functions.
 ##################################################
-AC_CHECK_FUNCS_ONCE([fchdir])
+AC_CHECK_FUNCS_ONCE([fchdir fpathconf dirfd])
 
 ##################################################
 # Checks for processor independent files.