1.1 --- a/configure.ac	Fri Apr 30 20:37:08 2010 +0100
     1.2 +++ b/configure.ac	Thu Nov 10 11:19:34 2011 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  #                                               -*- Autoconf -*-
     1.5  # Process this file with autoconf to produce a configure script.
     1.6  
     1.7 -AC_INIT([plover],[0.3],[ali@juiblex.co.uk])
     1.8 +AC_INIT([plover],[0.4],[ali@juiblex.co.uk])
     1.9  AC_PREREQ(2.59)
    1.10  AC_CONFIG_AUX_DIR([config])
    1.11  AC_CONFIG_SRCDIR([plover/plover.h])
    1.12 @@ -18,6 +18,10 @@
    1.13  app-manager/Makefile
    1.14  app-manager/resources.rc
    1.15  ])
    1.16 +PLOVER_MSWIN_MANIFEST([setup/setup.exe.manifest:setup/manifest.xml.in
    1.17 +update/update.exe.manifest:update/manifest.xml.in
    1.18 +app-manager/app-manager.exe.manifest:app-manager/manifest.xml.in
    1.19 +])
    1.20  AM_INIT_AUTOMAKE(no-define)
    1.21  case $VERSION in
    1.22    *.*.*)
    1.23 @@ -37,6 +41,9 @@
    1.24      AC_SUBST(PLOVER_MICRO_VERSION,0)
    1.25      ;;
    1.26  esac
    1.27 +AC_CANONICAL_HOST
    1.28 +AC_SUBST(HOST_OS,$host_os)
    1.29 +AC_SUBST(HOST_CPU,$host_cpu)
    1.30  
    1.31  # libtool versioning for libplover. For a release one of the following
    1.32  # must apply:
    1.33 @@ -47,8 +54,8 @@
    1.34  #   increment CURRENT and set AGE and REVISION to 0.
    1.35  # - If the interface is the same as the previous version, increment REVISION.
    1.36  #
    1.37 -lt_current=0
    1.38 -lt_revision=1
    1.39 +lt_current=1
    1.40 +lt_revision=0
    1.41  lt_age=0
    1.42  LIBPLOVER_LT_VERSION_INFO="$lt_current:$lt_revision:$lt_age"
    1.43  AC_SUBST(LIBPLOVER_LT_VERSION_INFO)
    1.44 @@ -56,7 +63,7 @@
    1.45  # and likewise for plover-gtk.
    1.46  #
    1.47  lt_current=0
    1.48 -lt_revision=0
    1.49 +lt_revision=1
    1.50  lt_age=0
    1.51  PLOVER_GTK_LT_VERSION_INFO="$lt_current:$lt_revision:$lt_age"
    1.52  AC_SUBST(PLOVER_GTK_LT_VERSION_INFO)
    1.53 @@ -75,6 +82,9 @@
    1.54  # Checks for header files.
    1.55  ##################################################
    1.56  AC_HEADER_STDC
    1.57 +AC_CHECK_HEADERS([winhttp.h],[],[],
    1.58 +[#include <windows.h>
    1.59 +])
    1.60  
    1.61  ##################################################
    1.62  # Checks for typedefs, structures, and compiler characteristics.
    1.63 @@ -83,7 +93,7 @@
    1.64  ##################################################
    1.65  # Checks for libraries.
    1.66  ##################################################
    1.67 -PKG_CHECK_MODULES(RAZOR,[razor >= 0.2],[:],[RAZOR_LIBS=-lrazor])
    1.68 +PKG_CHECK_MODULES(RAZOR,[razor >= 0.5],[:],[RAZOR_LIBS=-lrazor])
    1.69  PKG_CHECK_MODULES(EXPAT,[expat],[:],[EXPAT_LIBS=-lexpat])
    1.70  PKG_CHECK_MODULES(ZLIB,[zlib],[:],[ZLIB_LIBS=-lz])
    1.71  PKG_CHECK_MODULES(GIO,[gio-2.0])