From 9a579bb77b7e9380cead0c16defc1548f0740e02 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Sat, 14 Apr 2012 15:43:15 +0200
Subject: [PATCH] fix version string updating

---
 src/configure    | 20 ++++++++++----------
 src/configure.ac |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/configure b/src/configure
index 959edd29..22c481f3 100755
--- a/src/configure
+++ b/src/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for Recoll 1.17.1.
+# Generated by GNU Autoconf 2.68 for Recoll 1.18.0.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -557,8 +557,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Recoll'
 PACKAGE_TARNAME='recoll'
-PACKAGE_VERSION='1.17.1'
-PACKAGE_STRING='Recoll 1.17.1'
+PACKAGE_VERSION='1.18.0'
+PACKAGE_STRING='Recoll 1.18.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1258,7 +1258,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 Recoll 1.17.1 to adapt to many kinds of systems.
+\`configure' configures Recoll 1.18.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1323,7 +1323,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Recoll 1.17.1:";;
+     short | recursive ) echo "Configuration of Recoll 1.18.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1450,7 +1450,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Recoll configure 1.17.1
+Recoll configure 1.18.0
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2003,7 +2003,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 Recoll $as_me 1.17.1, which was
+It was created by Recoll $as_me 1.18.0, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -5651,7 +5651,7 @@ test "X$m_prefix" = "XNONE" && m_prefix=/usr/local
 m_datadir=${m_prefix}/share
 QTRECOLL_DATADIR=${m_datadir}/recoll
 
-RCLVERSION='1.17.1'
+RCLVERSION=`cat VERSION`
 
 
 
@@ -6221,7 +6221,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 Recoll $as_me 1.17.1, which was
+This file was extended by Recoll $as_me 1.18.0, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6283,7 +6283,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="\\
-Recoll config.status 1.17.1
+Recoll config.status 1.18.0
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/src/configure.ac b/src/configure.ac
index 8bad8920..31c65468 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -500,7 +500,7 @@ test "X$m_prefix" = "XNONE" && m_prefix=/usr/local
 m_datadir=${m_prefix}/share
 QTRECOLL_DATADIR=${m_datadir}/recoll
 
-RCLVERSION='m4_esyscmd_s(cat VERSION)'
+RCLVERSION=`cat VERSION`
 
 AC_SUBST(X_CFLAGS)
 AC_SUBST(X_PRE_LIBS)