configure scripts now default to looking for xapian-config-1.3

This is now automatically done for development series (odd middle component
of the version number), but not for stable series (even middle component).

Fixes #695, reported by Jorge C. Leitão

xapian-applications/omega/configure.ac

@@ -1,6 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([xapian-omega], [1.3.3], [http://xapian.org/bugs])
+m4_define([project_version], [1.3.3])
+AC_INIT([xapian-omega], project_version, [http://xapian.org/bugs])
 AC_PREREQ([2.63])
 AM_INIT_AUTOMAKE([1.11 -Wportability subdir-objects tar-ustar no-dist-gzip dist-xz])
 
@@ -66,7 +67,9 @@ dnl Run tests using the C++ compiler.
 AC_LANG_CPLUSPLUS
 
 dnl Check for xapian-core.
-XO_LIB_XAPIAN([], [], [xapian-config])
+XO_LIB_XAPIAN([], [],
+    [xapian-config]regexp(project_version,
+			  [^\([0-9]*\.[0-9]*[13579]\)\..*$], [-\1]))
 
 dnl We want XAPIAN_CXXFLAGS to be used for configure tests.
 save_CXXFLAGS=$CXXFLAGS

xapian-bindings/configure.ac

@@ -4,7 +4,8 @@ dnl See xapian-core's HACKING document for details of the reasons for required
 dnl versions.
 AC_PREREQ([2.63])
 
-AC_INIT([xapian-bindings], [1.3.3], [http://xapian.org/bugs])
+m4_define([project_version], [1.3.3])
+AC_INIT([xapian-bindings], project_version, [http://xapian.org/bugs])
 
 dnl See xapian-core's HACKING document for details of the reasons for required
 dnl versions.
@@ -88,7 +89,9 @@ dnl Probe for any options needed to enable C++11 support.
 AX_CXX_COMPILE_STDCXX_11
 
 dnl Check for xapian-core.
-XO_LIB_XAPIAN([], [], [xapian-config])
+XO_LIB_XAPIAN([], [],
+    [xapian-config]regexp(project_version,
+			  [^\([0-9]*\.[0-9]*[13579]\)\..*$], [-\1]))
 
 NEED_JNILIB_EXT=no
 NEED_INTREE_DYLD=no

xapian-letor/configure.ac

@@ -2,7 +2,9 @@ dnl Process this file with autoconf to produce a configure script.
 
 dnl NB When updating the version for a release, update LIBRARY_VERSION_INFO
 dnl below too.
-AC_INIT([xapian-letor], [1.3.0], [http://xapian.org/bugs])
+m4_define([project_version], [1.3.0])
+AC_INIT([xapian-letor], project_version, [http://xapian.org/bugs])
+
 AC_PREREQ([2.64])
 dnl Extract from the libtool info manual:
 dnl
@@ -75,7 +77,9 @@ dnl Run tests using the C++ compiler.
 AC_LANG_CPLUSPLUS
 
 dnl Check for xapian-core.
-XO_LIB_XAPIAN([], [], [xapian-config])
+XO_LIB_XAPIAN([], [],
+    [xapian-config]regexp(project_version,
+			  [^\([0-9]*\.[0-9]*[13579]\)\..*$], [-\1]))
 
 dnl We want XAPIAN_CXXFLAGS to be used for configure tests.
 save_CXXFLAGS=$CXXFLAGS

xapian-maintainer-tools/git-tag-release

@@ -55,7 +55,7 @@ fi
 bad=0
 escaped_version=`echo "$version"|sed 's/\([^0-9]\)/\\\\\\1/g'`
 for d in xapian-core xapian-bindings xapian-applications/omega ; do
-    grep '^AC_INIT(.*\<'"$escaped_version"'\>' "$d/configure.ac" >/dev/null || {
+    grep '^\(AC_INIT(\|m4_define(\[project_version\],\).*\<'"$escaped_version"'\>' "$d/configure.ac" >/dev/null || {
 	echo "$d/configure.ac not version $version" 1>&2
 	bad=1
     }

xapian-maintainer-tools/make-xapian-git-snapshot-tarballs

@@ -200,7 +200,7 @@ foreach my $tag (@ARGV) {
 	    open OUT, ">", "tmp.out" or die $!;
 	    open IN, "<", $configure_ac or die $!;
 	    while (<IN>) {
-		s/(^AC_INIT\([^,]*,.*?)(\s*[),\]])/$1_git$revcount$2/g;
+		s/(^(?:AC_INIT\([^,]*|m4_define\(\[project_version\]),.*?)(\s*[),\]])/$1_git$revcount$2/g;
 		print OUT;
 	    }
 	    close IN or die $!;

xapian-maintainer-tools/win32msvc/genversion.pl

@@ -34,7 +34,7 @@
 
 open CONFFD, $confpath or die "Can't open \"$confpath\"";
 while (<CONFFD>) {
-    if (m/AC_INIT\(\[?xapian-.*\]?, \[?([0-9]+)\.([0-9]+)\.([0-9]+).*\)/) {
+    if (m/(?:AC_INIT\(\[?xapian-.*\]?|m4_define\(\[project_version\]), \[?([0-9]+)\.([0-9]+)\.([0-9]+).*\)/) {
 	$major = $1;
 	$minor = $2;
 	$revision = $3;