Ticket #135: xapian-back-to-autoconf-2.59.patch

configure.ac

@@ -5 +5 @@
 dnl 2.57 fixes the annoying warnings from configure on FreeBSD
 dnl 2.58 is needed by automake 1.8.5
 dnl 2.59 was released the same day as 2.58 to fix a problem
-dnl 2.60 is needed for AC_TYPE_SSIZE_T and docdir support
-AC_PREREQ(2.60)
+AC_PREREQ(2.59)
 dnl NB When updating the version for a release, update LIBRARY_VERSION_INFO
 dnl below too.
 AC_INIT(xapian-core, 0.9.10)dnl FIXME: bugreport addr as third argument
@@ -384 +383 @@
 AC_CHECK_FUNCS(gethostname)
 
 dnl mingw (for instance) lacks ssize_t
-AC_TYPE_SSIZE_T
+AC_CHECK_TYPE(ssize_t, int)
 
 AC_TYPE_PID_T
 
@@ -402 +401 @@
   test -z "$PERL" && AC_MSG_ERROR([perl is required in maintainer mode])
 fi
 
+dnl We only need to set docdir for compatibility with autoconf < 2.60 - this
+dnl code can be removed once we move to requiring autoconf 2.60 or newer.
+test -n "$docdir" || docdir='${datadir}/doc/${PACKAGE_TARNAME}'
+AC_SUBST(docdir)
+
 dnl Make DATADIR available to the library
 dnl This isn't currently used.  If we reenable it, it needs to be renamed
 dnl to avoid a clash with a mingw header.

HACKING

@@ -228 +228 @@
 Some older versions of these programs may not work correctly at the time of
 writing, we require the following versions:
 
-        autoconf (GNU Autoconf) 2.60
+        autoconf (GNU Autoconf) 2.59
                 2.57 fixes the annoying chmod warning on FreeBSD.  2.54 is
                 required by automake 1.6.3; autoconf 2.50 is needed for many
                 reasons anyway.  automake 1.8.5 needs at least 2.58, and 2.59
-                was released the same day as 2.58 to fix a problem.  2.60
-                provides docdir and AC_TYPE_SSIZE_T.  Currently snapshots and
-                release tarballs are generated with autoconf 2.61 but this
-                isn't yet a hard requirement.
+                was released the same day as 2.58 to fix a problem.  Currently
+                snapshots and release tarballs are generated with autoconf 2.61
+                but this isn't yet a hard requirement (because the spec file
+                for building RPMs currently runs autoreconf to avoid a libtool
+                bug with setting rpath for /usr/lib64, and such platforms may
+                still only have autoconf 2.59).
 
         automake (GNU automake) 1.9.5
                 automake 1.4 has problems with "make dist" in a VPATH build,