From a9ad6512d5557f71228ac5fbfdc497caf63be13a Mon Sep 17 00:00:00 2001
From: Klaus Ethgen <Klaus@Ethgen.de>
Date: Tue, 20 Aug 2019 19:54:39 +0100
Subject: [PATCH] Preparing release

---
 ChangeLog      |   94 ++-
 ChangeLog.html |   71 ++-
 Makefile.in    |    3 +-
 NEWS           |   10 +
 README.md      |    2 +-
 aclocal.m4     |  215 -------
 config.h.in    |    3 +
 configure      | 1588 ++++++++++++++++++++++++------------------------
 configure.ac   |    2 +-
 9 files changed, 972 insertions(+), 1016 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7ccd3a65..abe877da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,84 @@
-commit c029c5f0
+commit bd1ecdb6
+Author: Colin Clark <colin.clark@cclark.uk>
+Date:   Mon Aug 12 10:25:26 2019 +0100
+
+    Fix ZoneDetect licence bug
+    
+    ZoneDetect licence was not displayed
+
+commit 18afee58
+Author: Colin Clark <colin.clark@cclark.uk>
+Date:   Tue Aug 6 12:49:55 2019 +0100
+
+    Bug fix #626: Animated GIFS lead to high CPU load
+    
+    https://github.com/BestImageViewer/geeqie/issues/626
+    
+    Cure a memory leak.
+    A less significant memory leak remains.
+
+commit bc94f215
+Author: Colin Clark <colin.clark@cclark.uk>
+Date:   Mon Aug 5 12:56:48 2019 +0100
+
+    Bug fix: Eliminate runtime error
+    
+    Eliminate runtime error: "gdk_pixbuf_format_get_name: assertion 'format
+    != NULL' failed"
+
+commit 538c3261
+Author: Colin Clark <colin.clark@cclark.uk>
+Date:   Sun Aug 4 17:08:01 2019 +0100
+
+    Fix #626: Animated GIFS lead to high CPU load
+    
+    https://github.com/BestImageViewer/geeqie/issues/626
+    
+    File is read asynchronously, so no longer blocks while the file is read.
+    Cpu load is still high, but this is unavoidable.
+
+commit d7d01330
+Author: Dmitry Marakasov <>
+Date:   Sat Aug 3 12:34:42 2019 +0100
+
+    Fix #703: Fix build on non-glibc platforms
+    
+    https://github.com/BestImageViewer/geeqie/pull/703
+
+commit 662438ad
+Author: Colin Clark <colin.clark@cclark.uk>
+Date:   Sat Aug 3 12:25:16 2019 +0100
+
+    Fix #683: Build fails on macOS due to use of _NL_TIME_FIRST_WEEKDAY
+    
+    https://github.com/BestImageViewer/geeqie/issues/683
+
+commit ce3619e6
+Author: Klaus Ethgen <Klaus@Ethgen.de>
+Date:   Sat Jul 27 09:30:15 2019 +0100
+
+    Compatibility function for lua > 5.1
+
+commit 28221d2f
+Author: Klaus Ethgen <Klaus@Ethgen.de>
+Date:   Sun Jul 28 20:24:06 2019 +0100
+
+    Make the zoom lable a bit bigger
+    
+    Thanks Sami Farin for reporting and patch.
+    
+    Closes #686.
+
+commit 87e76531
+Author: Klaus Ethgen <Klaus@Ethgen.de>
+Date:   Sun Jul 28 23:14:39 2019 +0100
+
+    Limiting to more recent version of glib and fix travis
+    
+    g_utf8_make_valid was implemented with glib 2.52. That also causes
+    builds on ubuntu trusty fail.
+
+commit 17dfa054
 Author: Colin Clark <colin.clark@cclark.uk>
 Date:   Thu Jul 25 09:25:28 2019 +0100
 
@@ -6,7 +86,7 @@ Date:   Thu Jul 25 09:25:28 2019 +0100
     
     Improved error detection
 
-commit 66aa92c5
+commit 69b6794d
 Author: Colin Clark <colin.clark@cclark.uk>
 Date:   Wed Jul 24 16:47:06 2019 +0100
 
@@ -17,19 +97,19 @@ Date:   Wed Jul 24 16:47:06 2019 +0100
     European locales use a comma as a decimal separator.
     The XMP spec. specifies a dot as a decimal separator.
 
-commit 931cfae9
+commit e3f1bab5
 Author: Виктор Майстренко <>
 Date:   Fri Jul 12 10:43:56 2019 +0100
 
     Update Russian translation
 
-commit cf2c3d52
+commit 435502b0
 Author: Colin Clark <colin.clark@cclark.uk>
 Date:   Fri Jul 12 10:34:37 2019 +0100
 
     Remove references to obsolete desktop files
 
-commit 85fe8e1f
+commit 99a30398
 Author: Colin Clark <colin.clark@cclark.uk>
 Date:   Sun Jun 30 12:22:19 2019 +0100
 
@@ -43,7 +123,7 @@ Date:   Sun Jun 30 12:22:19 2019 +0100
     
     The output of the script should of course be text.
 
-commit ff0019ae
+commit 2038ab56
 Author: Colin Clark <colin.clark@cclark.uk>
 Date:   Sat Jun 22 16:37:40 2019 +0100
 
@@ -52,7 +132,7 @@ Date:   Sat Jun 22 16:37:40 2019 +0100
     When the Start-up directory radio buttons were initialized, the setting
     always reverted to No change.
 
-commit 7dc08907
+commit cc9a39ff
 Author: Colin Clark <colin.clark@cclark.uk>
 Date:   Mon Jun 17 11:32:22 2019 +0100
 
diff --git a/ChangeLog.html b/ChangeLog.html
index fe21bb22..95e7254c 100644
--- a/ChangeLog.html
+++ b/ChangeLog.html
@@ -1,39 +1,84 @@
 <html>
 <body>
 <ul>
-<li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=c029c5f0f80c49ef89f3548f3810c4d6027a9022">view commit </a></li><p>Author: Colin Clark<br>Date: 2019-07-25<br><textarea rows=4 cols=100>Bug fix: Compute TimeZone data 
+<li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=bd1ecdb6d863300c434e24d6b91b257cdf82547c">view commit </a></li><p>Author: Colin Clark<br>Date: 2019-08-12<br><textarea rows=4 cols=100>Fix ZoneDetect licence bug 
+
+ZoneDetect licence was not displayed
+</textarea><br><br></p>
+<li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=18afee58f0d7d576959a127cd42a466fce5290b3">view commit </a></li><p>Author: Colin Clark<br>Date: 2019-08-06<br><textarea rows=4 cols=100>Bug fix #626: Animated GIFS lead to high CPU load 
+
+https://github.com/BestImageViewer/geeqie/issues/626
+
+Cure a memory leak.
+A less significant memory leak remains.
+</textarea><br><br></p>
+<li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=bc94f215e4435be50531d6a687bbdb966e1ae442">view commit </a></li><p>Author: Colin Clark<br>Date: 2019-08-05<br><textarea rows=4 cols=100>Bug fix: Eliminate runtime error 
+
+Eliminate runtime error: "gdk_pixbuf_format_get_name: assertion 'format
+!= NULL' failed"
+</textarea><br><br></p>
+<li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=538c3261aba3d8f6b5177bc0163e134b0de9392a">view commit </a></li><p>Author: Colin Clark<br>Date: 2019-08-04<br><textarea rows=4 cols=100>Fix #626: Animated GIFS lead to high CPU load 
+
+https://github.com/BestImageViewer/geeqie/issues/626
+
+File is read asynchronously, so no longer blocks while the file is read.
+Cpu load is still high, but this is unavoidable.
+</textarea><br><br></p>
+<li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=d7d0133043064971077c9e1effa4edd35aaaf902">view commit </a></li><p>Author: Dmitry Marakasov<br>Date: 2019-08-03<br><textarea rows=4 cols=100>Fix #703: Fix build on non-glibc platforms 
+
+https://github.com/BestImageViewer/geeqie/pull/703
+</textarea><br><br></p>
+<li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=662438ad30d3ca609b7ca467fadf228abd16a642">view commit </a></li><p>Author: Colin Clark<br>Date: 2019-08-03<br><textarea rows=4 cols=100>Fix #683: Build fails on macOS due to use of _NL_TIME_FIRST_WEEKDAY 
+
+https://github.com/BestImageViewer/geeqie/issues/683
+</textarea><br><br></p>
+<li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=ce3619e619c99eeca253bc2a842d31451b57c378">view commit </a></li><p>Author: Klaus Ethgen<br>Date: 2019-07-27<br><textarea rows=4 cols=100>Compatibility function for lua > 5.1 
+
+</textarea><br><br></p>
+<li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=28221d2f86f54192e5385f4e5ef4ddda45c45f0d">view commit </a></li><p>Author: Klaus Ethgen<br>Date: 2019-07-28<br><textarea rows=4 cols=100>Make the zoom lable a bit bigger 
+
+Thanks Sami Farin for reporting and patch.
+
+Closes #686.
+</textarea><br><br></p>
+<li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=87e765314a6f7c7d5ed850dea2a63b62965c5e46">view commit </a></li><p>Author: Klaus Ethgen<br>Date: 2019-07-28<br><textarea rows=4 cols=100>Limiting to more recent version of glib and fix travis 
+
+g_utf8_make_valid was implemented with glib 2.52. That also causes
+builds on ubuntu trusty fail.
+</textarea><br><br></p>
+<li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=17dfa05433478f50441281b425fba75470e5700d">view commit </a></li><p>Author: Colin Clark<br>Date: 2019-07-25<br><textarea rows=4 cols=100>Bug fix: Compute TimeZone data 
 
 Improved error detection
 </textarea><br><br></p>
-<li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=66aa92c5b2ab1f9bf26841b732b500afef46db48">view commit </a></li><p>Author: Colin Clark<br>Date: 2019-07-24<br><textarea rows=4 cols=100>Fix #691: wrong GPS 
+<li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=69b6794d32a19c8985e73fe85188f6c128b8f2f5">view commit </a></li><p>Author: Colin Clark<br>Date: 2019-07-24<br><textarea rows=4 cols=100>Fix #691: wrong GPS 
 
 https://github.com/BestImageViewer/geeqie/issues/691
 
 European locales use a comma as a decimal separator.
 The XMP spec. specifies a dot as a decimal separator.
 </textarea><br><br></p>
-<li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=931cfae999c87fd38700df178624788182c23868">view commit </a></li><p>Author: Виктор Майстренко<br>Date: 2019-07-12<br><textarea rows=4 cols=100>Update Russian translation 
+<li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=e3f1bab5ed4686576b707bf54d237558cd5f9e31">view commit </a></li><p>Author: Виктор Майстренко<br>Date: 2019-07-12<br><textarea rows=4 cols=100>Update Russian translation 
 
 </textarea><br><br></p>
-<li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=cf2c3d525a553bc3989afecbdd44835480fa2c00">view commit </a></li><p>Author: Colin Clark<br>Date: 2019-07-12<br><textarea rows=4 cols=100>Remove references to obsolete desktop files 
+<li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=435502b033bd89b12bba42b6b5f5d293d9de88d1">view commit </a></li><p>Author: Colin Clark<br>Date: 2019-07-12<br><textarea rows=4 cols=100>Remove references to obsolete desktop files 
 
 </textarea><br><br></p>
-<li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=85fe8e1fdd642cc8538cfa016e8773699d536b34">view commit </a></li><p>Author: Colin Clark<br>Date: 2019-06-30<br><textarea rows=4 cols=100>Enable lua scripts to be called from Info sidebar 
+<li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=99a30398f7184ccbd313f5d589285f343d9eb658">view commit </a></li><p>Author: Colin Clark<br>Date: 2019-06-30<br><textarea rows=4 cols=100>Enable lua scripts to be called from Info sidebar 
 
 A lua script can be called from any of the List Panes in the Info
 sidebar.
 
 Add a new entry and in the Key field use:
-lua.<lua script name>
+lua.&lt;lua script name&gt;
 
 The output of the script should of course be text.
 </textarea><br><br></p>
-<li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=ff0019ae0780e80bd0fef1336444b1804172b38c">view commit </a></li><p>Author: Colin Clark<br>Date: 2019-06-22<br><textarea rows=4 cols=100>Bug fix: Start-up directory setting not preserved 
+<li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=2038ab5644598c95472977fce997d58f88f18d8c">view commit </a></li><p>Author: Colin Clark<br>Date: 2019-06-22<br><textarea rows=4 cols=100>Bug fix: Start-up directory setting not preserved 
 
 When the Start-up directory radio buttons were initialized, the setting
 always reverted to No change.
 </textarea><br><br></p>
-<li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=7dc08907ff2439a6074e8c043c06e440d938dbba">view commit </a></li><p>Author: Colin Clark<br>Date: 2019-06-17<br><textarea rows=4 cols=100>Implement downloadable timezone database 
+<li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=cc9a39fff411f20094b2ea09074bc541d0568330">view commit </a></li><p>Author: Colin Clark<br>Date: 2019-06-17<br><textarea rows=4 cols=100>Implement downloadable timezone database 
 
 Option in Preferences/General to download timezone database from
 geeqie.org/downloads
@@ -321,7 +366,7 @@ particularly appropriate, but its meaning should be clear.
 
 The target path is shown as a tooltip.
 </textarea><br><br></p>
-<li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=d354f618240b2889c9bb895f11f6d439c4994e1b">view commit </a></li><p>Author: Colin Clark<br>Date: 2018-10-21<br><textarea rows=4 cols=100>Do not grab focus when --remote view:<file> is used 
+<li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=d354f618240b2889c9bb895f11f6d439c4994e1b">view commit </a></li><p>Author: Colin Clark<br>Date: 2018-10-21<br><textarea rows=4 cols=100>Do not grab focus when --remote view:&lt;file&gt; is used 
 
 Ref:
 https://bugs.launchpad.net/ubuntu/+source/geeqie/+bug/1781858
@@ -932,11 +977,11 @@ titlebar. Off by default.
 <li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=01fd562adaacb04e680a655ada55ba983388eece">view commit </a></li><p>Author: Colin Clark<br>Date: 2018-04-01<br><textarea rows=4 cols=100>Additional remote commands for layout windows 
 
 Additional remote commands:
---remote --id:<ID>
+--remote --id:&lt;ID&gt;
 --remote --open-window
 --remote --close-window
 
-The id:<ID> parameter sends subsequent commands to the specified window.
+The id:&lt;ID&gt; parameter sends subsequent commands to the specified window.
 The window titlebar show the window identifier.
 </textarea><br><br></p>
 <li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=69022467c2db6ad8233114d743423e807cf35ded">view commit </a></li><p>Author: Colin Clark<br>Date: 2018-03-29<br><textarea rows=4 cols=100>Fix #162: Cannot symlink file if two geeqie instances are running 
@@ -1027,7 +1072,7 @@ create a bookmark will cause Geeqie to crash.
 <li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=0a6cb49628602587229c6c88627fa2e1453b1d52">view commit </a></li><p>Author: Klaus Ethgen<br>Date: 2018-01-23<br><textarea rows=4 cols=100>Fixing automake build system 
 
 </textarea><br><br></p>
-<li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=a58676634b1432605e3a4330c3395d62a6c90b88">view commit </a></li><p>Author: Colin Clark<br>Date: 2018-01-22<br><textarea rows=4 cols=100>Fix #523: <Esc> in "Really continue?" copy confirmation dialog leads to crash 
+<li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=a58676634b1432605e3a4330c3395d62a6c90b88">view commit </a></li><p>Author: Colin Clark<br>Date: 2018-01-22<br><textarea rows=4 cols=100>Fix #523: &lt;Esc&gt; in "Really continue?" copy confirmation dialog leads to crash 
 
 https://github.com/BestImageViewer/geeqie/issues/523
 
@@ -1236,7 +1281,7 @@ cleared by "make distclean", and so the old ID continues to be used.
 Revised user docs show to use:
 
 sudo make uninstall; sudo make maintainer-clean; ./autogen.sh
-make -j<no. of cpu cores>; sudo make install
+make -j&lt;no. of cpu cores&gt;; sudo make install
 </textarea><br><br></p>
 <li><a href="http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=0d8825dac65184ad2d6a8bec5c7954d3046935ee">view commit </a></li><p>Author: Colin Clark<br>Date: 2017-11-13<br><textarea rows=4 cols=100>Addl Fix #137: "Copy path" problem (or may be feature) 
 
diff --git a/Makefile.in b/Makefile.in
index b93908b3..987c5213 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -223,7 +223,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(srcdir)/geeqie.spec.in $(top_srcdir)/aminclude.am \
 	$(top_srcdir)/auxdir/compile $(top_srcdir)/auxdir/install-sh \
 	$(top_srcdir)/auxdir/missing AUTHORS COPYING ChangeLog NEWS \
-	TODO auxdir/compile auxdir/install-sh auxdir/missing
+	TODO auxdir/compile auxdir/depcomp auxdir/install-sh \
+	auxdir/missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
diff --git a/NEWS b/NEWS
index 4e41f548..793c1059 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+Geeqie 1.5.1
+============
+
+- Bugfixes for release 1.5
+- #626 - High CPU load with animated GIFs
+- #683 - Build failuer on macOS
+- #686 - Zoom lable adjustment
+- #703 - non-glibc fix
+- Lua compatibility
+
 Geeqie 1.5
 ==========
 
diff --git a/README.md b/README.md
index d354255f..fa6e1e18 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
       ###################################################################
-      ##                          Geeqie 1.5                           ##
+      ##                         Geeqie 1.5.1                          ##
       ##                                                               ##
       ##              Copyright (C) 2008 - 2018 The Geeqie Team        ##
       ##              Copyright (C) 1999 - 2006 John Ellis.            ##
diff --git a/aclocal.m4 b/aclocal.m4
index 588f6b0d..9abf6ab6 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -913,221 +913,6 @@ main ()
   rm -f conf.gtktest
 ])
 
-# Configure paths for GTK+
-# Owen Taylor     1997-2001
-
-# Version number used by aclocal, see `info automake Serials`.
-# Increment on every change.
-#serial 1
-
-dnl AM_PATH_GTK_3_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, 
-dnl pass to pkg-config
-dnl
-AC_DEFUN([AM_PATH_GTK_3_0],
-[m4_warn([obsolete], [AM_PATH_GTK_3_0 is deprecated, use PKG_CHECK_MODULES([GTK], [gtk+-3.0]) instead])
-dnl Get the cflags and libraries from pkg-config
-dnl
-AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run a test GTK+ program],
-		    , enable_gtktest=yes)
-  min_gtk_version=ifelse([$1], [], [3.0.0], [$1])
-
-  pkg_config_args="gtk+-3.0 >= $min_gtk_version"
-  for module in . $4
-  do
-      case "$module" in
-         gthread)
-             pkg_config_args="$pkg_config_args gthread-2.0"
-         ;;
-      esac
-  done
-
-  no_gtk=""
-
-  PKG_PROG_PKG_CONFIG([0.16])
-
-  if test -z "$PKG_CONFIG"; then
-    no_gtk=yes
-  fi
-
-  AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
-
-  if test -n "$PKG_CONFIG"; then
-    ## don't try to run the test against uninstalled libtool libs
-    if $PKG_CONFIG --uninstalled $pkg_config_args; then
-	  echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
-	  enable_gtktest=no
-    fi
-
-    if $PKG_CONFIG $pkg_config_args; then
-	  :
-    else
-	  no_gtk=yes
-    fi
-  fi
-
-  if test x"$no_gtk" = x ; then
-    GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
-    GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
-    gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-3.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-3.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-3.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_gtktest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GTK_CFLAGS"
-      LIBS="$GTK_LIBS $LIBS"
-dnl
-dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
-dnl checks the results of pkg-config to some extent)
-dnl
-      rm -f conf.gtktest
-      AC_TRY_RUN([
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int 
-main ()
-{
-  unsigned int major, minor, micro;
-
-  fclose (fopen ("conf.gtktest", "w"));
-
-  if (sscanf("$min_gtk_version", "%u.%u.%u", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gtk_version");
-     exit(1);
-   }
-
-  if ((gtk_major_version != $gtk_config_major_version) ||
-      (gtk_minor_version != $gtk_config_minor_version) ||
-      (gtk_micro_version != $gtk_config_micro_version))
-    {
-      printf("\n*** 'pkg-config --modversion gtk+-3.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
-             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-             gtk_major_version, gtk_minor_version, gtk_micro_version);
-      printf ("*** was found! If pkg-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-      printf("*** to point to the correct configuration files\n");
-    } 
-  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-	   (gtk_minor_version != GTK_MINOR_VERSION) ||
-           (gtk_micro_version != GTK_MICRO_VERSION))
-    {
-      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     gtk_major_version, gtk_minor_version, gtk_micro_version);
-    }
-  else
-    {
-      if ((gtk_major_version > major) ||
-        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GTK+ (%u.%u.%u) was found.\n",
-               gtk_major_version, gtk_minor_version, gtk_micro_version);
-        printf("*** You need a version of GTK+ newer than %u.%u.%u. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
-        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_gtk" = x ; then
-     AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
-     ifelse([$2], , :, [$2])
-  else
-     AC_MSG_RESULT(no)
-     if test -z "$PKG_CONFIG"; then
-       echo "*** A new enough version of pkg-config was not found."
-       echo "*** See http://pkgconfig.sourceforge.net"
-     else
-       if test -f conf.gtktest ; then
-        :
-       else
-          echo "*** Could not run GTK+ test program, checking why..."
-	  ac_save_CFLAGS="$CFLAGS"
-	  ac_save_LIBS="$LIBS"
-          CFLAGS="$CFLAGS $GTK_CFLAGS"
-          LIBS="$LIBS $GTK_LIBS"
-          AC_TRY_LINK([
-#include <gtk/gtk.h>
-#include <stdio.h>
-],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
-          echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occurred. This usually means GTK+ is incorrectly installed."])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GTK_CFLAGS=""
-     GTK_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GTK_CFLAGS)
-  AC_SUBST(GTK_LIBS)
-  rm -f conf.gtktest
-])
-
-dnl GTK_CHECK_BACKEND(BACKEND-NAME [, MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl   Tests for BACKEND-NAME in the GTK targets list
-dnl
-AC_DEFUN([GTK_CHECK_BACKEND],
-[m4_warn([obsolete], [GTK_CHECK_BACKEND is deprecated, use PKG_CHECK_MODULES([GTK_X11], [gtk+-x11-3.0]) or similar instead])
-  pkg_config_args=ifelse([$1],,gtk+-3.0, gtk+-$1-3.0)
-  min_gtk_version=ifelse([$2],,3.0.0,$2)
-  pkg_config_args="$pkg_config_args >= $min_gtk_version"
-
-  PKG_PROG_PKG_CONFIG([0.16])
-  AS_IF([test -z "$PKG_CONFIG"], [AC_MSG_ERROR([No pkg-config found])])
-
-  if $PKG_CONFIG $pkg_config_args ; then
-    target_found=yes
-  else
-    target_found=no
-  fi
-
-  if test "x$target_found" = "xno"; then
-    ifelse([$4],,[AC_MSG_ERROR([Backend $backend not found.])],[$4])
-  else
-    ifelse([$3],,[:],[$3])
-  fi
-])
-
 
 dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
 # serial 42 IT_PROG_INTLTOOL
diff --git a/config.h.in b/config.h.in
index dc8d75c3..c6eed0ca 100644
--- a/config.h.in
+++ b/config.h.in
@@ -159,6 +159,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Define if _NL_TIME_FIRST_WEEKDAY is available */
+#undef HAVE__NL_TIME_FIRST_WEEKDAY
+
 /* Build on native win32 OS */
 #undef OS_WIN32
 
diff --git a/configure b/configure
index 5f4d617b..8ad3111b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for geeqie 1.5.
+# Generated by GNU Autoconf 2.69 for geeqie 1.5.1.
 #
 # Report bugs to <https://github.com/BestImageViewer/geeqie/issues>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='geeqie'
 PACKAGE_TARNAME='geeqie'
-PACKAGE_VERSION='1.5'
-PACKAGE_STRING='geeqie 1.5'
+PACKAGE_VERSION='1.5.1'
+PACKAGE_STRING='geeqie 1.5.1'
 PACKAGE_BUGREPORT='https://github.com/BestImageViewer/geeqie/issues'
 PACKAGE_URL='http://www.geeqie.org/'
 
@@ -1525,7 +1525,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures geeqie 1.5 to adapt to many kinds of systems.
+\`configure' configures geeqie 1.5.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1592,7 +1592,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of geeqie 1.5:";;
+     short | recursive ) echo "Configuration of geeqie 1.5.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1788,7 +1788,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-geeqie configure 1.5
+geeqie configure 1.5.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2252,7 +2252,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by geeqie $as_me 1.5, which was
+It was created by geeqie $as_me 1.5.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3123,7 +3123,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='geeqie'
- VERSION='1.5'
+ VERSION='1.5.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -9082,7 +9082,7 @@ else
 fi
 
 
-  min_glib_version=2.24.0
+  min_glib_version=2.52.0
   pkg_config_args="glib-2.0 >= $min_glib_version"
   for module in .
   do
@@ -9575,7 +9575,7 @@ rm -f core conftest.err conftest.$ac_objext \
      GOBJECT_QUERY=""
      GLIB_MKENUMS=""
      GLIB_COMPILE_RESOURCES=""
-     as_fn_error $? "GLIB >= 2.24.0 not installed." "$LINENO" 5
+     as_fn_error $? "GLIB >= 2.52.0 not installed." "$LINENO" 5
   fi
   rm -f conf.glibtest
 
@@ -9591,16 +9591,18 @@ if test x$gtk3 = xyes; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"Gtk3 enabled\"" >&5
 $as_echo "$as_me: WARNING: \"Gtk3 enabled\"" >&2;}
 
-# Check whether --enable-gtktest was given.
+fi
+
+if test x$gtk3 = xno; then
+    # Check whether --enable-gtktest was given.
 if test "${enable_gtktest+set}" = set; then :
   enableval=$enable_gtktest;
 else
   enable_gtktest=yes
 fi
 
-  min_gtk_version=3.0.0
 
-  pkg_config_args="gtk+-3.0 >= $min_gtk_version"
+  pkg_config_args=gtk+-2.0
   for module in .
   do
       case "$module" in
@@ -9619,6 +9621,7 @@ fi
 
 
 
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -9720,7 +9723,7 @@ fi
 
 fi
 if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=0.16
+	_pkg_min_version=0.7
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
 $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
@@ -9733,21 +9736,18 @@ $as_echo "no" >&6; }
 	fi
 fi
 
-  if test -z "$PKG_CONFIG"; then
-    no_gtk=yes
-  fi
-
+  min_gtk_version=2.20.0
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5
 $as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; }
 
-  if test -n "$PKG_CONFIG"; then
+  if test x$PKG_CONFIG != xno ; then
     ## don't try to run the test against uninstalled libtool libs
     if $PKG_CONFIG --uninstalled $pkg_config_args; then
 	  echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
 	  enable_gtktest=no
     fi
 
-    if $PKG_CONFIG $pkg_config_args; then
+    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
 	  :
     else
 	  no_gtk=yes
@@ -9757,11 +9757,11 @@ $as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; }
   if test x"$no_gtk" = x ; then
     GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
     GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
-    gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-3.0 | \
+    gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-    gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-3.0 | \
+    gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
-    gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-3.0 | \
+    gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
     if test "x$enable_gtktest" = "xyes" ; then
       ac_save_CFLAGS="$CFLAGS"
@@ -9782,11 +9782,14 @@ else
 int
 main ()
 {
-  unsigned int major, minor, micro;
+  int major, minor, micro;
+  char *tmp_version;
 
   fclose (fopen ("conf.gtktest", "w"));
 
-  if (sscanf("$min_gtk_version", "%u.%u.%u", &major, &minor, &micro) != 3) {
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_gtk_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
      printf("%s, bad version string\n", "$min_gtk_version");
      exit(1);
    }
@@ -9795,7 +9798,7 @@ main ()
       (gtk_minor_version != $gtk_config_minor_version) ||
       (gtk_micro_version != $gtk_config_micro_version))
     {
-      printf("\n*** 'pkg-config --modversion gtk+-3.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
+      printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
              $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
              gtk_major_version, gtk_minor_version, gtk_micro_version);
       printf ("*** was found! If pkg-config was correct, then it is best\n");
@@ -9825,9 +9828,9 @@ main ()
        }
      else
       {
-        printf("\n*** An old version of GTK+ (%u.%u.%u) was found.\n",
+        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
                gtk_major_version, gtk_minor_version, gtk_micro_version);
-        printf("*** You need a version of GTK+ newer than %u.%u.%u. The latest version of\n",
+        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
 	       major, minor, micro);
         printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
         printf("***\n");
@@ -9864,7 +9867,7 @@ $as_echo "yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_
   else
      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-     if test -z "$PKG_CONFIG"; then
+     if test "$PKG_CONFIG" = "no" ; then
        echo "*** A new enough version of pkg-config was not found."
        echo "*** See http://pkgconfig.sourceforge.net"
      else
@@ -9902,7 +9905,7 @@ if ac_fn_c_try_link "$LINENO"; then :
           echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
 else
    echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occurred. This usually means GTK+ is incorrectly installed."
+          echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
@@ -9912,55 +9915,120 @@ rm -f core conftest.err conftest.$ac_objext \
      fi
      GTK_CFLAGS=""
      GTK_LIBS=""
-     as_fn_error $? "GTK+ >= 3.0.0 not installed." "$LINENO" 5
+     as_fn_error $? "GTK+ >= 2.20.0 not installed." "$LINENO" 5
   fi
 
 
   rm -f conf.gtktest
 
+    true
 fi
 
-if test x$gtk3 = xno; then
-    # Check whether --enable-gtktest was given.
-if test "${enable_gtktest+set}" = set; then :
-  enableval=$enable_gtktest;
-else
-  enable_gtktest=yes
+threads="auto"
+# Check whether --enable-threads was given.
+if test "${enable_threads+set}" = set; then :
+  enableval=$enable_threads; threads="${enableval}"
 fi
 
 
-  pkg_config_args=gtk+-2.0
-  for module in .
-  do
-      case "$module" in
-         gthread)
-             pkg_config_args="$pkg_config_args gthread-2.0"
-         ;;
-      esac
-  done
+have_gthread="no"
+if test "x${threads}" != "xno" ; then
 
-  no_gtk=""
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTHREAD" >&5
+$as_echo_n "checking for GTHREAD... " >&6; }
+
+if test -n "$GTHREAD_CFLAGS"; then
+    pkg_cv_GTHREAD_CFLAGS="$GTHREAD_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$GTHREAD_LIBS"; then
+    pkg_cv_GTHREAD_LIBS="$GTHREAD_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread-2.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
 
 
 
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gthread-2.0" 2>&1`
+        else
+	        GTHREAD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gthread-2.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GTHREAD_PKG_ERRORS" >&5
 
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"No thread support in glib\"" >&5
+$as_echo "$as_me: WARNING: \"No thread support in glib\"" >&2;}
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"No thread support in glib\"" >&5
+$as_echo "$as_me: WARNING: \"No thread support in glib\"" >&2;}
+else
+	GTHREAD_CFLAGS=$pkg_cv_GTHREAD_CFLAGS
+	GTHREAD_LIBS=$pkg_cv_GTHREAD_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	have_gthread="yes"
+fi
+fi
 
+if test "x$have_gthread" != "xno"; then
 
+$as_echo "#define HAVE_GTHREAD 1" >>confdefs.h
 
+        GLIB_CFLAGS="$GTHREAD_CFLAGS"
+        GLIB_LIBS="$GTHREAD_LIBS"
+fi
 
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+
+for ac_prog in "gdk-pixbuf-csource"
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if ${ac_cv_path_GDK_PIXBUF_CSOURCE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $PKG_CONFIG in
+  case $GDK_PIXBUF_CSOURCE in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ac_cv_path_GDK_PIXBUF_CSOURCE="$GDK_PIXBUF_CSOURCE" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -9970,7 +10038,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_path_GDK_PIXBUF_CSOURCE="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -9981,29 +10049,29 @@ IFS=$as_save_IFS
   ;;
 esac
 fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+GDK_PIXBUF_CSOURCE=$ac_cv_path_GDK_PIXBUF_CSOURCE
+if test -n "$GDK_PIXBUF_CSOURCE"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDK_PIXBUF_CSOURCE" >&5
+$as_echo "$GDK_PIXBUF_CSOURCE" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
-  ac_pt_PKG_CONFIG=$PKG_CONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
+  test -n "$GDK_PIXBUF_CSOURCE" && break
+done
+
+# Extract the first word of "glib-genmarshal", so it can be a program name with args.
+set dummy glib-genmarshal; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+if ${ac_cv_path_GLIB_GENMARSHAL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $ac_pt_PKG_CONFIG in
+  case $GLIB_GENMARSHAL in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ac_cv_path_GLIB_GENMARSHAL="$GLIB_GENMARSHAL" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -10013,7 +10081,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -10024,338 +10092,55 @@ IFS=$as_save_IFS
   ;;
 esac
 fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
+if test -n "$GLIB_GENMARSHAL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_GENMARSHAL" >&5
+$as_echo "$GLIB_GENMARSHAL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_pt_PKG_CONFIG" = x; then
-    PKG_CONFIG=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    PKG_CONFIG=$ac_pt_PKG_CONFIG
-  fi
-else
-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
 
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=0.7
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-		PKG_CONFIG=""
-	fi
-fi
 
-  min_gtk_version=2.20.0
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5
-$as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; }
 
-  if test x$PKG_CONFIG != xno ; then
-    ## don't try to run the test against uninstalled libtool libs
-    if $PKG_CONFIG --uninstalled $pkg_config_args; then
-	  echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
-	  enable_gtktest=no
-    fi
+# Check whether --with-readmedir was given.
+if test "${with_readmedir+set}" = set; then :
+  withval=$with_readmedir; readmedir=$withval
+else
+  readmedir="$prefix/share/doc/geeqie-$VERSION"
+fi
 
-    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
-	  :
-    else
-	  no_gtk=yes
-    fi
-  fi
 
-  if test x"$no_gtk" = x ; then
-    GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
-    GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
-    gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-    gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
-    gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
-    if test "x$enable_gtktest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GTK_CFLAGS"
-      LIBS="$GTK_LIBS $LIBS"
-      rm -f conf.gtktest
-      if test "$cross_compiling" = yes; then :
-  echo $ac_n "cross compiling; assumed OK... $ac_c"
+# Check whether --with-htmldir was given.
+if test "${with_htmldir+set}" = set; then :
+  withval=$with_htmldir; htmldir=$withval
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+  htmldir="$readmedir/html"
+fi
 
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
 
-int
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  fclose (fopen ("conf.gtktest", "w"));
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_gtk_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gtk_version");
-     exit(1);
-   }
-
-  if ((gtk_major_version != $gtk_config_major_version) ||
-      (gtk_minor_version != $gtk_config_minor_version) ||
-      (gtk_micro_version != $gtk_config_micro_version))
-    {
-      printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
-             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-             gtk_major_version, gtk_minor_version, gtk_micro_version);
-      printf ("*** was found! If pkg-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-      printf("*** to point to the correct configuration files\n");
-    }
-  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-	   (gtk_minor_version != GTK_MINOR_VERSION) ||
-           (gtk_micro_version != GTK_MICRO_VERSION))
-    {
-      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     gtk_major_version, gtk_minor_version, gtk_micro_version);
-    }
-  else
-    {
-      if ((gtk_major_version > major) ||
-        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
-               gtk_major_version, gtk_minor_version, gtk_micro_version);
-        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
-        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
 
+cat >>confdefs.h <<_ACEOF
+#define GQ_HELPDIR "$readmedir"
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
 
-else
-  no_gtk=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_gtk" = x ; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5
-$as_echo "yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; }
-     :
-  else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-     if test "$PKG_CONFIG" = "no" ; then
-       echo "*** A new enough version of pkg-config was not found."
-       echo "*** See http://pkgconfig.sourceforge.net"
-     else
-       if test -f conf.gtktest ; then
-        :
-       else
-          echo "*** Could not run GTK+ test program, checking why..."
-	  ac_save_CFLAGS="$CFLAGS"
-	  ac_save_LIBS="$LIBS"
-          CFLAGS="$CFLAGS $GTK_CFLAGS"
-          LIBS="$LIBS $GTK_LIBS"
-          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-#include <gtk/gtk.h>
-#include <stdio.h>
-
-int
-main ()
-{
- return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
-  ;
-  return 0;
-}
+cat >>confdefs.h <<_ACEOF
+#define GQ_HTMLDIR "$htmldir"
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-   echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
-          echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-else
-   echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GTK_CFLAGS=""
-     GTK_LIBS=""
-     as_fn_error $? "GTK+ >= 2.20.0 not installed." "$LINENO" 5
-  fi
-
-
-  rm -f conf.gtktest
-
-    true
-fi
-
-threads="auto"
-# Check whether --enable-threads was given.
-if test "${enable_threads+set}" = set; then :
-  enableval=$enable_threads; threads="${enableval}"
-fi
-
-
-have_gthread="no"
-if test "x${threads}" != "xno" ; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTHREAD" >&5
-$as_echo_n "checking for GTHREAD... " >&6; }
-
-if test -n "$GTHREAD_CFLAGS"; then
-    pkg_cv_GTHREAD_CFLAGS="$GTHREAD_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$GTHREAD_LIBS"; then
-    pkg_cv_GTHREAD_LIBS="$GTHREAD_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread-2.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gthread-2.0" 2>&1`
-        else
-	        GTHREAD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gthread-2.0" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GTHREAD_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"No thread support in glib\"" >&5
-$as_echo "$as_me: WARNING: \"No thread support in glib\"" >&2;}
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"No thread support in glib\"" >&5
-$as_echo "$as_me: WARNING: \"No thread support in glib\"" >&2;}
-else
-	GTHREAD_CFLAGS=$pkg_cv_GTHREAD_CFLAGS
-	GTHREAD_LIBS=$pkg_cv_GTHREAD_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_gthread="yes"
-fi
-fi
-
-if test "x$have_gthread" != "xno"; then
-
-$as_echo "#define HAVE_GTHREAD 1" >>confdefs.h
-
-        GLIB_CFLAGS="$GTHREAD_CFLAGS"
-        GLIB_LIBS="$GTHREAD_LIBS"
-fi
 
 
-for ac_prog in "gdk-pixbuf-csource"
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
+# Extract the first word of "gnome-doc-tool", so it can be a program name with args.
+set dummy gnome-doc-tool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GDK_PIXBUF_CSOURCE+:} false; then :
+if ${ac_cv_path_GNOME_DOC_TOOL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $GDK_PIXBUF_CSOURCE in
+  case $GNOME_DOC_TOOL in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_GDK_PIXBUF_CSOURCE="$GDK_PIXBUF_CSOURCE" # Let the user override the test with a path.
+  ac_cv_path_GNOME_DOC_TOOL="$GNOME_DOC_TOOL" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -10365,7 +10150,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_GDK_PIXBUF_CSOURCE="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_path_GNOME_DOC_TOOL="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -10376,122 +10161,10 @@ IFS=$as_save_IFS
   ;;
 esac
 fi
-GDK_PIXBUF_CSOURCE=$ac_cv_path_GDK_PIXBUF_CSOURCE
-if test -n "$GDK_PIXBUF_CSOURCE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDK_PIXBUF_CSOURCE" >&5
-$as_echo "$GDK_PIXBUF_CSOURCE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$GDK_PIXBUF_CSOURCE" && break
-done
-
-# Extract the first word of "glib-genmarshal", so it can be a program name with args.
-set dummy glib-genmarshal; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GLIB_GENMARSHAL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $GLIB_GENMARSHAL in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GLIB_GENMARSHAL="$GLIB_GENMARSHAL" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
-if test -n "$GLIB_GENMARSHAL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_GENMARSHAL" >&5
-$as_echo "$GLIB_GENMARSHAL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-# Check whether --with-readmedir was given.
-if test "${with_readmedir+set}" = set; then :
-  withval=$with_readmedir; readmedir=$withval
-else
-  readmedir="$prefix/share/doc/geeqie-$VERSION"
-fi
-
-
-# Check whether --with-htmldir was given.
-if test "${with_htmldir+set}" = set; then :
-  withval=$with_htmldir; htmldir=$withval
-else
-  htmldir="$readmedir/html"
-fi
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define GQ_HELPDIR "$readmedir"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define GQ_HTMLDIR "$htmldir"
-_ACEOF
-
-
-# Extract the first word of "gnome-doc-tool", so it can be a program name with args.
-set dummy gnome-doc-tool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GNOME_DOC_TOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $GNOME_DOC_TOOL in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GNOME_DOC_TOOL="$GNOME_DOC_TOOL" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_GNOME_DOC_TOOL="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-GNOME_DOC_TOOL=$ac_cv_path_GNOME_DOC_TOOL
-if test -n "$GNOME_DOC_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNOME_DOC_TOOL" >&5
-$as_echo "$GNOME_DOC_TOOL" >&6; }
+GNOME_DOC_TOOL=$ac_cv_path_GNOME_DOC_TOOL
+if test -n "$GNOME_DOC_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNOME_DOC_TOOL" >&5
+$as_echo "$GNOME_DOC_TOOL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -12030,168 +11703,550 @@ fi
 
 
 
-    if test "$gt_cv_have_gettext" = "yes" ; then
-
-$as_echo "#define ENABLE_NLS 1" >>confdefs.h
-
-    fi
-
-        if test "$XGETTEXT" != ":"; then
-                  if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-        : ;
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
-$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
-        XGETTEXT=":"
-      fi
-    fi
+    if test "$gt_cv_have_gettext" = "yes" ; then
+
+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
+
+    fi
+
+        if test "$XGETTEXT" != ":"; then
+                  if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+        : ;
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
+$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
+        XGETTEXT=":"
+      fi
+    fi
+
+    # We need to process the po/ directory.
+    POSUB=po
+
+    ac_config_commands="$ac_config_commands default-1"
+
+
+                for lang in $ALL_LINGUAS; do
+      GMOFILES="$GMOFILES $lang.gmo"
+      POFILES="$POFILES $lang.po"
+    done
+
+
+
+
+
+
+
+
+
+
+
+
+
+   if test "$gt_cv_have_gettext" = "yes"; then
+     if test "x$ALL_LINGUAS" = "x"; then
+       LINGUAS=
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
+$as_echo_n "checking for catalogs to be installed... " >&6; }
+       NEW_LINGUAS=
+       for presentlang in $ALL_LINGUAS; do
+         useit=no
+         if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
+           desiredlanguages="$LINGUAS"
+         else
+           desiredlanguages="$ALL_LINGUAS"
+         fi
+         for desiredlang in $desiredlanguages; do
+ 	   # Use the presentlang catalog if desiredlang is
+           #   a. equal to presentlang, or
+           #   b. a variant of presentlang (because in this case,
+           #      presentlang can be used as a fallback for messages
+           #      which are not translated in the desiredlang catalog).
+           case "$desiredlang" in
+             "$presentlang"*) useit=yes;;
+           esac
+         done
+         if test $useit = yes; then
+           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
+         fi
+       done
+       LINGUAS=$NEW_LINGUAS
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
+$as_echo "$LINGUAS" >&6; }
+     fi
+
+          if test -n "$LINGUAS"; then
+       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+     fi
+   fi
+
+            MKINSTALLDIRS=
+   if test -n "$ac_aux_dir"; then
+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+   fi
+   if test -z "$MKINSTALLDIRS"; then
+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+   fi
+
+
+         test -d po || mkdir po
+   if test "x$srcdir" != "x."; then
+     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+       posrcprefix="$srcdir/"
+     else
+       posrcprefix="../$srcdir/"
+     fi
+   else
+     posrcprefix="../"
+   fi
+   rm -f po/POTFILES
+   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+	< $srcdir/po/POTFILES.in > po/POTFILES
+
+glib_save_prefix="$prefix"
+glib_save_exec_prefix="$exec_prefix"
+glib_save_datarootdir="$datarootdir"
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+datarootdir=`eval echo "${datarootdir}"`
+if test "x$CATOBJEXT" = "x.mo" ; then
+  localedir=`eval echo "${libdir}/locale"`
+else
+  localedir=`eval echo "${datadir}/locale"`
+fi
+prefix="$glib_save_prefix"
+exec_prefix="$glib_save_exec_prefix"
+datarootdir="$glib_save_datarootdir"
+
+cat >>confdefs.h <<_ACEOF
+#define GQ_LOCALEDIR "$localedir"
+_ACEOF
+
+
+
+
+
+
+
+
+
+#  clutter and champlain support
+# ----------------------------------------------------------------------
+
+# Check whether --enable-map was given.
+if test "${enable_map+set}" = set; then :
+  enableval=$enable_map; libgps=$enableval
+else
+  libgps=auto
+fi
+
+
+# Check whether --enable-gpu-accel was given.
+if test "${enable_gpu_accel+set}" = set; then :
+  enableval=$enable_gpu_accel; libclutter=$enableval
+else
+  libclutter=auto
+fi
+
+
+if test "x${libclutter}" != "xno" -a "x${gtk3}" != "xno"; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLUTTER" >&5
+$as_echo_n "checking for CLUTTER... " >&6; }
+
+if test -n "$CLUTTER_CFLAGS"; then
+    pkg_cv_CLUTTER_CFLAGS="$CLUTTER_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-1.0 >= 1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "clutter-1.0 >= 1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_CLUTTER_CFLAGS=`$PKG_CONFIG --cflags "clutter-1.0 >= 1.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$CLUTTER_LIBS"; then
+    pkg_cv_CLUTTER_LIBS="$CLUTTER_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-1.0 >= 1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "clutter-1.0 >= 1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_CLUTTER_LIBS=`$PKG_CONFIG --libs "clutter-1.0 >= 1.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        CLUTTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "clutter-1.0 >= 1.0" 2>&1`
+        else
+	        CLUTTER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "clutter-1.0 >= 1.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$CLUTTER_PKG_ERRORS" >&5
+
+
+      HAVE_CLUTTER=no
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $CLUTTER_PKG_ERRORS" >&5
+$as_echo "$as_me: WARNING: $CLUTTER_PKG_ERRORS" >&2;}
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+      HAVE_CLUTTER=no
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $CLUTTER_PKG_ERRORS" >&5
+$as_echo "$as_me: WARNING: $CLUTTER_PKG_ERRORS" >&2;}
+
+else
+	CLUTTER_CFLAGS=$pkg_cv_CLUTTER_CFLAGS
+	CLUTTER_LIBS=$pkg_cv_CLUTTER_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLUTTER_GTK" >&5
+$as_echo_n "checking for CLUTTER_GTK... " >&6; }
+
+if test -n "$CLUTTER_GTK_CFLAGS"; then
+    pkg_cv_CLUTTER_GTK_CFLAGS="$CLUTTER_GTK_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-gtk-1.0 >= 1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "clutter-gtk-1.0 >= 1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_CLUTTER_GTK_CFLAGS=`$PKG_CONFIG --cflags "clutter-gtk-1.0 >= 1.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$CLUTTER_GTK_LIBS"; then
+    pkg_cv_CLUTTER_GTK_LIBS="$CLUTTER_GTK_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-gtk-1.0 >= 1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "clutter-gtk-1.0 >= 1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_CLUTTER_GTK_LIBS=`$PKG_CONFIG --libs "clutter-gtk-1.0 >= 1.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        CLUTTER_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "clutter-gtk-1.0 >= 1.0" 2>&1`
+        else
+	        CLUTTER_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "clutter-gtk-1.0 >= 1.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$CLUTTER_GTK_PKG_ERRORS" >&5
+
+
+          HAVE_CLUTTER=no
+          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $CLUTTER_GTK_PKG_ERRORS" >&5
+$as_echo "$as_me: WARNING: $CLUTTER_GTK_PKG_ERRORS" >&2;}
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+          HAVE_CLUTTER=no
+          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $CLUTTER_GTK_PKG_ERRORS" >&5
+$as_echo "$as_me: WARNING: $CLUTTER_GTK_PKG_ERRORS" >&2;}
+
+else
+	CLUTTER_GTK_CFLAGS=$pkg_cv_CLUTTER_GTK_CFLAGS
+	CLUTTER_GTK_LIBS=$pkg_cv_CLUTTER_GTK_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+          HAVE_CLUTTER=yes
+
+$as_echo "#define HAVE_CLUTTER 1" >>confdefs.h
+
+
+fi
+
+fi
+else
+  HAVE_CLUTTER=disabled
+fi
+
+
+
+
+
+
+
+#  Libchamplain support - used for map facility
+# ----------------------------------------------------------------------
+
+if test "x${libgps}" != "xno" -a "x${HAVE_CLUTTER}" = "xyes"; then
+    if test "x${gtk3}" != "xno"; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBCHAMPLAIN" >&5
+$as_echo_n "checking for LIBCHAMPLAIN... " >&6; }
+
+if test -n "$LIBCHAMPLAIN_CFLAGS"; then
+    pkg_cv_LIBCHAMPLAIN_CFLAGS="$LIBCHAMPLAIN_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"champlain-0.12 >= 0.12\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "champlain-0.12 >= 0.12") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBCHAMPLAIN_CFLAGS=`$PKG_CONFIG --cflags "champlain-0.12 >= 0.12" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$LIBCHAMPLAIN_LIBS"; then
+    pkg_cv_LIBCHAMPLAIN_LIBS="$LIBCHAMPLAIN_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"champlain-0.12 >= 0.12\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "champlain-0.12 >= 0.12") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBCHAMPLAIN_LIBS=`$PKG_CONFIG --libs "champlain-0.12 >= 0.12" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-    # We need to process the po/ directory.
-    POSUB=po
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        LIBCHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "champlain-0.12 >= 0.12" 2>&1`
+        else
+	        LIBCHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "champlain-0.12 >= 0.12" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBCHAMPLAIN_PKG_ERRORS" >&5
 
-    ac_config_commands="$ac_config_commands default-1"
 
+          HAVE_LIBCHAMPLAIN=no
+          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LIBCHAMPLAIN_PKG_ERRORS" >&5
+$as_echo "$as_me: WARNING: $LIBCHAMPLAIN_PKG_ERRORS" >&2;}
 
-                for lang in $ALL_LINGUAS; do
-      GMOFILES="$GMOFILES $lang.gmo"
-      POFILES="$POFILES $lang.po"
-    done
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
+          HAVE_LIBCHAMPLAIN=no
+          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LIBCHAMPLAIN_PKG_ERRORS" >&5
+$as_echo "$as_me: WARNING: $LIBCHAMPLAIN_PKG_ERRORS" >&2;}
 
+else
+	LIBCHAMPLAIN_CFLAGS=$pkg_cv_LIBCHAMPLAIN_CFLAGS
+	LIBCHAMPLAIN_LIBS=$pkg_cv_LIBCHAMPLAIN_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
+          HAVE_LIBCHAMPLAIN=yes
 
+$as_echo "#define HAVE_LIBCHAMPLAIN 1" >>confdefs.h
 
 
+fi
+    else
+      HAVE_LIBCHAMPLAIN=disabled
+    fi
+else
+  HAVE_LIBCHAMPLAIN=disabled
+fi
 
+if test "x${libgps}" != "xno" -a "x${HAVE_LIBCHAMPLAIN}" = "xyes" ; then
 
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBCHAMPLAIN_GTK" >&5
+$as_echo_n "checking for LIBCHAMPLAIN_GTK... " >&6; }
 
+if test -n "$LIBCHAMPLAIN_GTK_CFLAGS"; then
+    pkg_cv_LIBCHAMPLAIN_GTK_CFLAGS="$LIBCHAMPLAIN_GTK_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"champlain-gtk-0.12 >= 0.12\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "champlain-gtk-0.12 >= 0.12") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBCHAMPLAIN_GTK_CFLAGS=`$PKG_CONFIG --cflags "champlain-gtk-0.12 >= 0.12" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$LIBCHAMPLAIN_GTK_LIBS"; then
+    pkg_cv_LIBCHAMPLAIN_GTK_LIBS="$LIBCHAMPLAIN_GTK_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"champlain-gtk-0.12 >= 0.12\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "champlain-gtk-0.12 >= 0.12") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBCHAMPLAIN_GTK_LIBS=`$PKG_CONFIG --libs "champlain-gtk-0.12 >= 0.12" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
 
 
 
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-   if test "$gt_cv_have_gettext" = "yes"; then
-     if test "x$ALL_LINGUAS" = "x"; then
-       LINGUAS=
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
-$as_echo_n "checking for catalogs to be installed... " >&6; }
-       NEW_LINGUAS=
-       for presentlang in $ALL_LINGUAS; do
-         useit=no
-         if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
-           desiredlanguages="$LINGUAS"
-         else
-           desiredlanguages="$ALL_LINGUAS"
-         fi
-         for desiredlang in $desiredlanguages; do
- 	   # Use the presentlang catalog if desiredlang is
-           #   a. equal to presentlang, or
-           #   b. a variant of presentlang (because in this case,
-           #      presentlang can be used as a fallback for messages
-           #      which are not translated in the desiredlang catalog).
-           case "$desiredlang" in
-             "$presentlang"*) useit=yes;;
-           esac
-         done
-         if test $useit = yes; then
-           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
-         fi
-       done
-       LINGUAS=$NEW_LINGUAS
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
-$as_echo "$LINGUAS" >&6; }
-     fi
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        LIBCHAMPLAIN_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "champlain-gtk-0.12 >= 0.12" 2>&1`
+        else
+	        LIBCHAMPLAIN_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "champlain-gtk-0.12 >= 0.12" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBCHAMPLAIN_GTK_PKG_ERRORS" >&5
 
-          if test -n "$LINGUAS"; then
-       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-     fi
-   fi
 
-            MKINSTALLDIRS=
-   if test -n "$ac_aux_dir"; then
-     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-   fi
-   if test -z "$MKINSTALLDIRS"; then
-     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-   fi
+      HAVE_LIBCHAMPLAIN_GTK=no
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LIBCHAMPLAIN_GTK_PKG_ERRORS" >&5
+$as_echo "$as_me: WARNING: $LIBCHAMPLAIN_GTK_PKG_ERRORS" >&2;}
 
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-         test -d po || mkdir po
-   if test "x$srcdir" != "x."; then
-     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-       posrcprefix="$srcdir/"
-     else
-       posrcprefix="../$srcdir/"
-     fi
-   else
-     posrcprefix="../"
-   fi
-   rm -f po/POTFILES
-   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-	< $srcdir/po/POTFILES.in > po/POTFILES
+      HAVE_LIBCHAMPLAIN_GTK=no
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LIBCHAMPLAIN_GTK_PKG_ERRORS" >&5
+$as_echo "$as_me: WARNING: $LIBCHAMPLAIN_GTK_PKG_ERRORS" >&2;}
 
-glib_save_prefix="$prefix"
-glib_save_exec_prefix="$exec_prefix"
-glib_save_datarootdir="$datarootdir"
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-datarootdir=`eval echo "${datarootdir}"`
-if test "x$CATOBJEXT" = "x.mo" ; then
-  localedir=`eval echo "${libdir}/locale"`
 else
-  localedir=`eval echo "${datadir}/locale"`
-fi
-prefix="$glib_save_prefix"
-exec_prefix="$glib_save_exec_prefix"
-datarootdir="$glib_save_datarootdir"
-
-cat >>confdefs.h <<_ACEOF
-#define GQ_LOCALEDIR "$localedir"
-_ACEOF
+	LIBCHAMPLAIN_GTK_CFLAGS=$pkg_cv_LIBCHAMPLAIN_GTK_CFLAGS
+	LIBCHAMPLAIN_GTK_LIBS=$pkg_cv_LIBCHAMPLAIN_GTK_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
+      HAVE_LIBCHAMPLAIN_GTK=yes
 
+$as_echo "#define HAVE_LIBCHAMPLAIN_GTK 1" >>confdefs.h
 
 
+fi
+else
+  HAVE_LIBCHAMPLAIN_GTK=disabled
+fi
 
+ if test "x$HAVE_LIBCHAMPLAIN_GTK" = xyes; then
+  HAVE_LIBCHAMPLAIN_GTK_TRUE=
+  HAVE_LIBCHAMPLAIN_GTK_FALSE='#'
+else
+  HAVE_LIBCHAMPLAIN_GTK_TRUE='#'
+  HAVE_LIBCHAMPLAIN_GTK_FALSE=
+fi
 
 
 
 
-#  clutter and champlain support
+#  Lua support
 # ----------------------------------------------------------------------
 
-# Check whether --enable-map was given.
-if test "${enable_map+set}" = set; then :
-  enableval=$enable_map; libgps=$enableval
-else
-  libgps=auto
-fi
-
-
-# Check whether --enable-gpu-accel was given.
-if test "${enable_gpu_accel+set}" = set; then :
-  enableval=$enable_gpu_accel; libclutter=$enableval
+# Check whether --enable-lua was given.
+if test "${enable_lua+set}" = set; then :
+  enableval=$enable_lua; liblua=$enableval
 else
-  libclutter=auto
+  liblua=auto
 fi
 
 
-if test "x${libclutter}" != "xno" -a "x${gtk3}" != "xno"; then
+if test "x${liblua}" != "xno"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLUTTER" >&5
-$as_echo_n "checking for CLUTTER... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
+$as_echo_n "checking for LUA... " >&6; }
 
-if test -n "$CLUTTER_CFLAGS"; then
-    pkg_cv_CLUTTER_CFLAGS="$CLUTTER_CFLAGS"
+if test -n "$LUA_CFLAGS"; then
+    pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-1.0 >= 1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "clutter-1.0 >= 1.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.3 >= 5.3\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "lua5.3 >= 5.3") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_CLUTTER_CFLAGS=`$PKG_CONFIG --cflags "clutter-1.0 >= 1.0" 2>/dev/null`
+  pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua5.3 >= 5.3" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12199,16 +12254,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$CLUTTER_LIBS"; then
-    pkg_cv_CLUTTER_LIBS="$CLUTTER_LIBS"
+if test -n "$LUA_LIBS"; then
+    pkg_cv_LUA_LIBS="$LUA_LIBS"
  elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-1.0 >= 1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "clutter-1.0 >= 1.0") 2>&5
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.3 >= 5.3\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "lua5.3 >= 5.3") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_CLUTTER_LIBS=`$PKG_CONFIG --libs "clutter-1.0 >= 1.0" 2>/dev/null`
+  pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua5.3 >= 5.3" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12229,47 +12284,29 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        CLUTTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "clutter-1.0 >= 1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua5.3 >= 5.3" 2>&1`
         else
-	        CLUTTER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "clutter-1.0 >= 1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua5.3 >= 5.3" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$CLUTTER_PKG_ERRORS" >&5
-
-
-      HAVE_CLUTTER=no
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $CLUTTER_PKG_ERRORS" >&5
-$as_echo "$as_me: WARNING: $CLUTTER_PKG_ERRORS" >&2;}
-
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-      HAVE_CLUTTER=no
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $CLUTTER_PKG_ERRORS" >&5
-$as_echo "$as_me: WARNING: $CLUTTER_PKG_ERRORS" >&2;}
+	echo "$LUA_PKG_ERRORS" >&5
 
-else
-	CLUTTER_CFLAGS=$pkg_cv_CLUTTER_CFLAGS
-	CLUTTER_LIBS=$pkg_cv_CLUTTER_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLUTTER_GTK" >&5
-$as_echo_n "checking for CLUTTER_GTK... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
+$as_echo_n "checking for LUA... " >&6; }
 
-if test -n "$CLUTTER_GTK_CFLAGS"; then
-    pkg_cv_CLUTTER_GTK_CFLAGS="$CLUTTER_GTK_CFLAGS"
+if test -n "$LUA_CFLAGS"; then
+    pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-gtk-1.0 >= 1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "clutter-gtk-1.0 >= 1.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_CLUTTER_GTK_CFLAGS=`$PKG_CONFIG --cflags "clutter-gtk-1.0 >= 1.0" 2>/dev/null`
+  pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua5.1 >= 5.1" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12277,16 +12314,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$CLUTTER_GTK_LIBS"; then
-    pkg_cv_CLUTTER_GTK_LIBS="$CLUTTER_GTK_LIBS"
+if test -n "$LUA_LIBS"; then
+    pkg_cv_LUA_LIBS="$LUA_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-gtk-1.0 >= 1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "clutter-gtk-1.0 >= 1.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_CLUTTER_GTK_LIBS=`$PKG_CONFIG --libs "clutter-gtk-1.0 >= 1.0" 2>/dev/null`
+  pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua5.1 >= 5.1" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12307,70 +12344,29 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        CLUTTER_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "clutter-gtk-1.0 >= 1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua5.1 >= 5.1" 2>&1`
         else
-	        CLUTTER_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "clutter-gtk-1.0 >= 1.0" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua5.1 >= 5.1" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$CLUTTER_GTK_PKG_ERRORS" >&5
-
-
-          HAVE_CLUTTER=no
-          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $CLUTTER_GTK_PKG_ERRORS" >&5
-$as_echo "$as_me: WARNING: $CLUTTER_GTK_PKG_ERRORS" >&2;}
-
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-          HAVE_CLUTTER=no
-          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $CLUTTER_GTK_PKG_ERRORS" >&5
-$as_echo "$as_me: WARNING: $CLUTTER_GTK_PKG_ERRORS" >&2;}
-
-else
-	CLUTTER_GTK_CFLAGS=$pkg_cv_CLUTTER_GTK_CFLAGS
-	CLUTTER_GTK_LIBS=$pkg_cv_CLUTTER_GTK_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-          HAVE_CLUTTER=yes
-
-$as_echo "#define HAVE_CLUTTER 1" >>confdefs.h
-
-
-fi
-
-fi
-else
-  HAVE_CLUTTER=disabled
-fi
-
-
-
-
-
-
+	echo "$LUA_PKG_ERRORS" >&5
 
-#  Libchamplain support - used for map facility
-# ----------------------------------------------------------------------
 
-if test "x${libgps}" != "xno" -a "x${HAVE_CLUTTER}" = "xyes"; then
-    if test "x${gtk3}" != "xno"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBCHAMPLAIN" >&5
-$as_echo_n "checking for LIBCHAMPLAIN... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
+$as_echo_n "checking for LUA... " >&6; }
 
-if test -n "$LIBCHAMPLAIN_CFLAGS"; then
-    pkg_cv_LIBCHAMPLAIN_CFLAGS="$LIBCHAMPLAIN_CFLAGS"
+if test -n "$LUA_CFLAGS"; then
+    pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"champlain-0.12 >= 0.12\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "champlain-0.12 >= 0.12") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "lua >= 5.1") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBCHAMPLAIN_CFLAGS=`$PKG_CONFIG --cflags "champlain-0.12 >= 0.12" 2>/dev/null`
+  pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua >= 5.1" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12378,16 +12374,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$LIBCHAMPLAIN_LIBS"; then
-    pkg_cv_LIBCHAMPLAIN_LIBS="$LIBCHAMPLAIN_LIBS"
+if test -n "$LUA_LIBS"; then
+    pkg_cv_LUA_LIBS="$LUA_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"champlain-0.12 >= 0.12\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "champlain-0.12 >= 0.12") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "lua >= 5.1") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBCHAMPLAIN_LIBS=`$PKG_CONFIG --libs "champlain-0.12 >= 0.12" 2>/dev/null`
+  pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua >= 5.1" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12408,61 +12404,58 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBCHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "champlain-0.12 >= 0.12" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua >= 5.1" 2>&1`
         else
-	        LIBCHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "champlain-0.12 >= 0.12" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua >= 5.1" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$LIBCHAMPLAIN_PKG_ERRORS" >&5
+	echo "$LUA_PKG_ERRORS" >&5
 
 
-          HAVE_LIBCHAMPLAIN=no
-          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LIBCHAMPLAIN_PKG_ERRORS" >&5
-$as_echo "$as_me: WARNING: $LIBCHAMPLAIN_PKG_ERRORS" >&2;}
+	       HAVE_LUA=no
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LUA_PKG_ERRORS" >&5
+$as_echo "$as_me: WARNING: $LUA_PKG_ERRORS" >&2;}
 
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
-          HAVE_LIBCHAMPLAIN=no
-          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LIBCHAMPLAIN_PKG_ERRORS" >&5
-$as_echo "$as_me: WARNING: $LIBCHAMPLAIN_PKG_ERRORS" >&2;}
+	       HAVE_LUA=no
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LUA_PKG_ERRORS" >&5
+$as_echo "$as_me: WARNING: $LUA_PKG_ERRORS" >&2;}
 
 else
-	LIBCHAMPLAIN_CFLAGS=$pkg_cv_LIBCHAMPLAIN_CFLAGS
-	LIBCHAMPLAIN_LIBS=$pkg_cv_LIBCHAMPLAIN_LIBS
+	LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
+	LUA_LIBS=$pkg_cv_LUA_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-          HAVE_LIBCHAMPLAIN=yes
+	      HAVE_LUA=yes
 
-$as_echo "#define HAVE_LIBCHAMPLAIN 1" >>confdefs.h
+$as_echo "#define HAVE_LUA 1" >>confdefs.h
 
 
-fi
-    else
-      HAVE_LIBCHAMPLAIN=disabled
-    fi
-else
-  HAVE_LIBCHAMPLAIN=disabled
 fi
 
-if test "x${libgps}" != "xno" -a "x${HAVE_LIBCHAMPLAIN}" = "xyes" ; then
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBCHAMPLAIN_GTK" >&5
-$as_echo_n "checking for LIBCHAMPLAIN_GTK... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
+$as_echo_n "checking for LUA... " >&6; }
 
-if test -n "$LIBCHAMPLAIN_GTK_CFLAGS"; then
-    pkg_cv_LIBCHAMPLAIN_GTK_CFLAGS="$LIBCHAMPLAIN_GTK_CFLAGS"
+if test -n "$LUA_CFLAGS"; then
+    pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"champlain-gtk-0.12 >= 0.12\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "champlain-gtk-0.12 >= 0.12") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "lua >= 5.1") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBCHAMPLAIN_GTK_CFLAGS=`$PKG_CONFIG --cflags "champlain-gtk-0.12 >= 0.12" 2>/dev/null`
+  pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua >= 5.1" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12470,16 +12463,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$LIBCHAMPLAIN_GTK_LIBS"; then
-    pkg_cv_LIBCHAMPLAIN_GTK_LIBS="$LIBCHAMPLAIN_GTK_LIBS"
+if test -n "$LUA_LIBS"; then
+    pkg_cv_LUA_LIBS="$LUA_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"champlain-gtk-0.12 >= 0.12\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "champlain-gtk-0.12 >= 0.12") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "lua >= 5.1") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBCHAMPLAIN_GTK_LIBS=`$PKG_CONFIG --libs "champlain-gtk-0.12 >= 0.12" 2>/dev/null`
+  pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua >= 5.1" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12500,65 +12493,56 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBCHAMPLAIN_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "champlain-gtk-0.12 >= 0.12" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua >= 5.1" 2>&1`
         else
-	        LIBCHAMPLAIN_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "champlain-gtk-0.12 >= 0.12" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua >= 5.1" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$LIBCHAMPLAIN_GTK_PKG_ERRORS" >&5
+	echo "$LUA_PKG_ERRORS" >&5
 
 
-      HAVE_LIBCHAMPLAIN_GTK=no
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LIBCHAMPLAIN_GTK_PKG_ERRORS" >&5
-$as_echo "$as_me: WARNING: $LIBCHAMPLAIN_GTK_PKG_ERRORS" >&2;}
+	       HAVE_LUA=no
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LUA_PKG_ERRORS" >&5
+$as_echo "$as_me: WARNING: $LUA_PKG_ERRORS" >&2;}
 
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
-      HAVE_LIBCHAMPLAIN_GTK=no
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LIBCHAMPLAIN_GTK_PKG_ERRORS" >&5
-$as_echo "$as_me: WARNING: $LIBCHAMPLAIN_GTK_PKG_ERRORS" >&2;}
+	       HAVE_LUA=no
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LUA_PKG_ERRORS" >&5
+$as_echo "$as_me: WARNING: $LUA_PKG_ERRORS" >&2;}
 
 else
-	LIBCHAMPLAIN_GTK_CFLAGS=$pkg_cv_LIBCHAMPLAIN_GTK_CFLAGS
-	LIBCHAMPLAIN_GTK_LIBS=$pkg_cv_LIBCHAMPLAIN_GTK_LIBS
+	LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
+	LUA_LIBS=$pkg_cv_LUA_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-      HAVE_LIBCHAMPLAIN_GTK=yes
+	      HAVE_LUA=yes
 
-$as_echo "#define HAVE_LIBCHAMPLAIN_GTK 1" >>confdefs.h
+$as_echo "#define HAVE_LUA 1" >>confdefs.h
 
 
-fi
-else
-  HAVE_LIBCHAMPLAIN_GTK=disabled
 fi
 
- if test "x$HAVE_LIBCHAMPLAIN_GTK" = xyes; then
-  HAVE_LIBCHAMPLAIN_GTK_TRUE=
-  HAVE_LIBCHAMPLAIN_GTK_FALSE='#'
 else
-  HAVE_LIBCHAMPLAIN_GTK_TRUE='#'
-  HAVE_LIBCHAMPLAIN_GTK_FALSE=
-fi
-
+	LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
+	LUA_LIBS=$pkg_cv_LUA_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
+	 HAVE_LUA=yes
 
+$as_echo "#define HAVE_LUA 1" >>confdefs.h
 
-#  Lua support
-# ----------------------------------------------------------------------
 
-# Check whether --enable-lua was given.
-if test "${enable_lua+set}" = set; then :
-  enableval=$enable_lua; liblua=$enableval
-else
-  liblua=auto
 fi
 
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-if test "x${liblua}" != "xno"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
@@ -12679,16 +12663,16 @@ fi
 	echo "$LUA_PKG_ERRORS" >&5
 
 
-	    HAVE_LUA=no
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LUA_PKG_ERRORS" >&5
+	       HAVE_LUA=no
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LUA_PKG_ERRORS" >&5
 $as_echo "$as_me: WARNING: $LUA_PKG_ERRORS" >&2;}
 
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
-	    HAVE_LUA=no
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LUA_PKG_ERRORS" >&5
+	       HAVE_LUA=no
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LUA_PKG_ERRORS" >&5
 $as_echo "$as_me: WARNING: $LUA_PKG_ERRORS" >&2;}
 
 else
@@ -12697,7 +12681,7 @@ else
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-	   HAVE_LUA=yes
+	      HAVE_LUA=yes
 
 $as_echo "#define HAVE_LUA 1" >>confdefs.h
 
@@ -12768,16 +12752,16 @@ fi
 	echo "$LUA_PKG_ERRORS" >&5
 
 
-	    HAVE_LUA=no
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LUA_PKG_ERRORS" >&5
+	       HAVE_LUA=no
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LUA_PKG_ERRORS" >&5
 $as_echo "$as_me: WARNING: $LUA_PKG_ERRORS" >&2;}
 
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
-	    HAVE_LUA=no
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LUA_PKG_ERRORS" >&5
+	       HAVE_LUA=no
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LUA_PKG_ERRORS" >&5
 $as_echo "$as_me: WARNING: $LUA_PKG_ERRORS" >&2;}
 
 else
@@ -12786,7 +12770,20 @@ else
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-	   HAVE_LUA=yes
+	      HAVE_LUA=yes
+
+$as_echo "#define HAVE_LUA 1" >>confdefs.h
+
+
+fi
+
+else
+	LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
+	LUA_LIBS=$pkg_cv_LUA_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+	 HAVE_LUA=yes
 
 $as_echo "#define HAVE_LUA 1" >>confdefs.h
 
@@ -12947,6 +12944,41 @@ else
 fi
 
 
+# _NL_TIME_FIRST_WEEKDAY support
+# note that it is an enum and not a define
+# ----------------------------------------------------------------------
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _NL_TIME_FIRST_WEEKDAY" >&5
+$as_echo_n "checking for _NL_TIME_FIRST_WEEKDAY... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <langinfo.h>
+int
+main ()
+{
+
+char c;
+c = *((unsigned char *)  nl_langinfo(_NL_TIME_FIRST_WEEKDAY));
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  nl_ok=yes
+else
+  nl_ok=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $nl_ok" >&5
+$as_echo "$nl_ok" >&6; }
+if test "$nl_ok" = "yes"; then
+
+$as_echo "#define HAVE__NL_TIME_FIRST_WEEKDAY 1" >>confdefs.h
+
+fi
+
 # ----------------------------------------------------------------------
 
 
@@ -13655,7 +13687,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by geeqie $as_me 1.5, which was
+This file was extended by geeqie $as_me 1.5.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13722,7 +13754,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-geeqie config.status 1.5
+geeqie config.status 1.5.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 96ad5ae1..79d8f1f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl GNU General Public License for more details.
 
 AC_PREREQ(2.57)
-AC_INIT([geeqie], 1.5, [https://github.com/BestImageViewer/geeqie/issues], [], [http://www.geeqie.org/])
+AC_INIT([geeqie], 1.5.1, [https://github.com/BestImageViewer/geeqie/issues], [], [http://www.geeqie.org/])
 
 # Add -Werror to the default CFLAGS
 CFLAGS+=" -Werror -Wno-error=deprecated-declarations -Wno-error=sign-compare -Wno-error=return-type"
-- 
2.20.1