1.1 --- a/configure.ac Fri Mar 23 20:29:24 2012 +0000
1.2 +++ b/configure.ac Sat Nov 15 19:04:45 2014 +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.4.3],[ali@juiblex.co.uk])
1.8 +AC_INIT([plover],[0.4.50],[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 @@ -15,14 +15,18 @@
1.13 setup/resources.rc
1.14 update/Makefile
1.15 update/resources.rc
1.16 +pre-inst/Makefile
1.17 +pre-inst/resources.rc
1.18 app-manager/Makefile
1.19 app-manager/resources.rc
1.20 ])
1.21 PLOVER_MSWIN_MANIFEST([setup/setup.exe.manifest:setup/manifest.xml.in
1.22 update/update.exe.manifest:update/manifest.xml.in
1.23 +pre-inst/pre-inst.exe.manifest:pre-inst/manifest.xml.in
1.24 app-manager/app-manager.exe.manifest:app-manager/manifest.xml.in
1.25 ])
1.26 AM_INIT_AUTOMAKE(no-define)
1.27 +m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
1.28 case $VERSION in
1.29 *.*.*)
1.30 AC_SUBST(PLOVER_MAJOR_VERSION,[[`echo $VERSION | sed 's/\..*//'`]])
1.31 @@ -44,6 +48,15 @@
1.32 AC_CANONICAL_HOST
1.33 AC_SUBST(HOST_OS,$host_os)
1.34 AC_SUBST(HOST_CPU,$host_cpu)
1.35 +case $host_os in
1.36 + mingw*)
1.37 + host_mingw="yes"
1.38 + ;;
1.39 + *)
1.40 + host_mingw=""
1.41 + ;;
1.42 +esac
1.43 +AM_CONDITIONAL(PLOVER_MINGW,[test -n "$host_mingw"])
1.44
1.45 # libtool versioning for libplover. For a release one of the following
1.46 # must apply:
1.47 @@ -54,7 +67,7 @@
1.48 # increment CURRENT and set AGE and REVISION to 0.
1.49 # - If the interface is the same as the previous version, increment REVISION.
1.50 #
1.51 -lt_current=2
1.52 +lt_current=3
1.53 lt_revision=0
1.54 lt_age=0
1.55 LIBPLOVER_LT_VERSION_INFO="$lt_current:$lt_revision:$lt_age"
1.56 @@ -93,32 +106,44 @@
1.57 ##################################################
1.58 # Checks for libraries.
1.59 ##################################################
1.60 +PKG_CHECK_MODULES(WHELK,[whelk])
1.61 PKG_CHECK_MODULES(RAZOR,[razor >= 0.5.4],[:],[RAZOR_LIBS=-lrazor])
1.62 PKG_CHECK_MODULES(EXPAT,[expat],[:],[EXPAT_LIBS=-lexpat])
1.63 PKG_CHECK_MODULES(ZLIB,[zlib],[:],[ZLIB_LIBS=-lz])
1.64 PKG_CHECK_MODULES(GIO,[gio-2.0])
1.65 PKG_CHECK_MODULES(GTK,[gtk+-2.0])
1.66 PKG_CHECK_MODULES(GMODULE_EXPORT,[gmodule-export-2.0])
1.67 -LIBPLOVER_CFLAGS="$RAZOR_CFLAGS $EXPAT_CFLAGS $ZLIB_CFLAGS"
1.68 -LIBPLOVER_LIBS="$RAZOR_LIBS $EXPAT_LIBS $ZLIB_LIBS"
1.69 +LIBPLOVER_CFLAGS="$RAZOR_CFLAGS $EXPAT_CFLAGS $ZLIB_CFLAGS $GIO_CFLAGS"
1.70 +LIBPLOVER_LIBS="$RAZOR_LIBS $EXPAT_LIBS $ZLIB_LIBS $GIO_LIBS"
1.71 AC_SUBST(LIBPLOVER_CFLAGS)
1.72 AC_SUBST(LIBPLOVER_LIBS)
1.73 PLOVER_GTK_CFLAGS="$GTK_CFLAGS $RAZOR_CFLAGS"
1.74 PLOVER_GTK_LIBS="$GTK_LIBS $RAZOR_LIBS"
1.75 AC_SUBST(PLOVER_GTK_CFLAGS)
1.76 AC_SUBST(PLOVER_GTK_LIBS)
1.77 -GUI_CFLAGS="$GMODULE_EXPORT_CFLAGS $GIO_CFLAGS $PLOVER_GTK_CFLAGS $LIBPLOVER_CFLAGS"
1.78 -GUI_LIBS="$GMODULE_EXPORT_LIBS $GIO_LIBS $PLOVER_GTK_LIBS $LIBPLOVER_LIBS"
1.79 +save_LIBS="$LIBS"
1.80 +AC_SEARCH_LIBS([crypt],[crypt])
1.81 +GUI_CFLAGS="$GMODULE_EXPORT_CFLAGS $WHELK_CFLAGS $PLOVER_GTK_CFLAGS \
1.82 + $LIBPLOVER_CFLAGS"
1.83 +GUI_LIBS="-llua-posix $GMODULE_EXPORT_LIBS $WHELK_LIBS $PLOVER_GTK_LIBS \
1.84 + $LIBPLOVER_LIBS $LIBS"
1.85 +LIBS="$save_LIBS"
1.86 AC_SUBST(GUI_CFLAGS)
1.87 AC_SUBST(GUI_LIBS)
1.88 save_PKG_CONFIG="$PKG_CONFIG"
1.89 PKG_CONFIG="$PKG_CONFIG --static"
1.90 -PKG_CHECK_MODULES(SETUP,[whelk])
1.91 +PKG_CHECK_MODULES(SETUP,[whelk razor >= 0.5.4 expat zlib gio-2.0])
1.92 +if test -n "$host_mingw"; then
1.93 + # Hack: -liconv is required for mingw. This probably stems from our use of
1.94 + # libiconv rather than win-iconv that Fedora uses, but should be addressed
1.95 + # somewhere in the stack below us.
1.96 + SETUP_LIBS="$SETUP_LIBS -liconv"
1.97 +fi
1.98 PKG_CONFIG="$save_PKG_CONFIG"
1.99 save_LIBS="$LIBS"
1.100 AC_SEARCH_LIBS([crypt],[crypt])
1.101 -SETUP_LIBS="-llua-posix $SETUP_LIBS $RAZOR_LIBS $LIBS"
1.102 -SETUP_CFLAGS="$SETUP_CFLAGS $RAZOR_CFLAGS"
1.103 +SETUP_LIBS="-llua-posix $SETUP_LIBS $LIBS"
1.104 +SETUP_CFLAGS="$SETUP_CFLAGS"
1.105 AC_SUBST(SETUP_LIBS)
1.106 AC_SUBST(SETUP_CFLAGS)
1.107 LIBS="$save_LIBS"
1.108 @@ -139,7 +164,7 @@
1.109 ##################################################
1.110 # Checks for library functions.
1.111 ##################################################
1.112 -AC_CHECK_FUNCS_ONCE([fchdir])
1.113 +AC_CHECK_FUNCS_ONCE([fchdir fpathconf dirfd])
1.114
1.115 ##################################################
1.116 # Checks for processor independent files.