diff -r 8b50be3e2998 -r 29d8bb64056c configure.ac --- a/configure.ac Fri Apr 30 20:37:08 2010 +0100 +++ b/configure.ac Thu Nov 10 11:19:34 2011 +0000 @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_INIT([plover],[0.3],[ali@juiblex.co.uk]) +AC_INIT([plover],[0.4],[ali@juiblex.co.uk]) AC_PREREQ(2.59) AC_CONFIG_AUX_DIR([config]) AC_CONFIG_SRCDIR([plover/plover.h]) @@ -18,6 +18,10 @@ 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 +app-manager/app-manager.exe.manifest:app-manager/manifest.xml.in +]) AM_INIT_AUTOMAKE(no-define) case $VERSION in *.*.*) @@ -37,6 +41,9 @@ AC_SUBST(PLOVER_MICRO_VERSION,0) ;; esac +AC_CANONICAL_HOST +AC_SUBST(HOST_OS,$host_os) +AC_SUBST(HOST_CPU,$host_cpu) # libtool versioning for libplover. For a release one of the following # must apply: @@ -47,8 +54,8 @@ # increment CURRENT and set AGE and REVISION to 0. # - If the interface is the same as the previous version, increment REVISION. # -lt_current=0 -lt_revision=1 +lt_current=1 +lt_revision=0 lt_age=0 LIBPLOVER_LT_VERSION_INFO="$lt_current:$lt_revision:$lt_age" AC_SUBST(LIBPLOVER_LT_VERSION_INFO) @@ -56,7 +63,7 @@ # and likewise for plover-gtk. # lt_current=0 -lt_revision=0 +lt_revision=1 lt_age=0 PLOVER_GTK_LT_VERSION_INFO="$lt_current:$lt_revision:$lt_age" AC_SUBST(PLOVER_GTK_LT_VERSION_INFO) @@ -75,6 +82,9 @@ # Checks for header files. ################################################## AC_HEADER_STDC +AC_CHECK_HEADERS([winhttp.h],[],[], +[#include +]) ################################################## # Checks for typedefs, structures, and compiler characteristics. @@ -83,7 +93,7 @@ ################################################## # Checks for libraries. ################################################## -PKG_CHECK_MODULES(RAZOR,[razor >= 0.2],[:],[RAZOR_LIBS=-lrazor]) +PKG_CHECK_MODULES(RAZOR,[razor >= 0.5],[:],[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])