Ticket #791: xapian-791-master.patch

xapian-core/configure.ac

@@ -603 +603 @@
 fi
 
 AC_ARG_ENABLE([64bit_docid],
-  [AS_HELP_STRING([--enable-64bit-docid], [enable 64bit docid [default=no]])],
+  [AS_HELP_STRING([--enable-64bit-docid], [enable 64bit docid])],
   [case ${enableval} in
     yes|no) ;;
   *) AC_MSG_ERROR([bad value ${enableval} for --enable-64bit-docid]) ;;
@@ -611 +611 @@
   [enable_64bit_docid=no])
 
 AC_ARG_ENABLE([64bit_termcount],
-  [AS_HELP_STRING([--enable-64bit-termcount], [enable 64bit termcount [default=no]])],
+  [AS_HELP_STRING([--enable-64bit-termcount], [enable 64bit termcount])],
   [case ${enableval} in
     yes|no) ;;
   *) AC_MSG_ERROR([bad value ${enableval} for --enable-64bit-termcount]) ;;
@@ -619 +619 @@
   [enable_64bit_termcount=no])
 
 AC_ARG_ENABLE([64bit_termpos],
-  [AS_HELP_STRING([--enable-64bit-termpos], [enable 64bit termpos [default=no]])],
+  [AS_HELP_STRING([--enable-64bit-termpos], [enable 64bit termpos])],
   [case ${enableval} in
     yes|no) ;;
   *) AC_MSG_ERROR([bad value ${enableval} for --enable-64bit-termpos]) ;;
@@ -882 +882 @@
 
 dnl Check which database backends should be built.
 
-AC_DEFUN([_XAPIAN_BACKEND_ENABLE],
+AC_DEFUN([XAPIAN_BACKEND_ENABLE],
   [AC_ARG_ENABLE([backend_$1],
     [AS_HELP_STRING([--enable-backend-$1], [build the $1 database backend [default=$3]])],
     [case $enableval in
@@ -891 +891 @@
     esac], [enable_backend_$1=$2])
   ])
 
-AC_DEFUN([XAPIAN_BACKEND_ENABLE],
-  [_XAPIAN_BACKEND_ENABLE([$1],
-    m4_default([$2], [yes]),
-    m4_default([$3], [yes]))
-  ])
-
 dnl When adding a new backend, update INSTALL too.
 XAPIAN_BACKEND_ENABLE([glass], [$enable_gpl_libxapian], [yes (unless --disable-gpl-libxapian)])
-XAPIAN_BACKEND_ENABLE([honey])
+XAPIAN_BACKEND_ENABLE([honey], [yes], [yes])
 XAPIAN_BACKEND_ENABLE([inmemory], [$enable_gpl_libxapian], [yes (unless --disable-gpl-libxapian)])
 default_enable_backend_remote=$enable_gpl_libxapian
 case $host_os in