Ticket #791: xapian-791.patch

File xapian-791.patch, 2.6 KB (added by Дилян Палаузов, 6 years ago)

For features enabled by default, print on "./configure --help" how to disalbe them

  • xapian-core/configure.ac 

    diff --git a/xapian-core/configure.ac b/xapian-core/configure.ac
    a b if test x$USE_MAINTAINER_MODE = xyes; then  
    595595fi
    596596
    597597AC_ARG_ENABLE([64bit_docid],
    598   [AS_HELP_STRING([--enable-64bit-docid], [enable 64bit docid [default=no]])],
     598  [AS_HELP_STRING([--enable-64bit-docid], [enable 64bit docid])],
    599599  [case ${enableval} in
    600600    yes|no) ;;
    601601  *) AC_MSG_ERROR([bad value ${enableval} for --enable-64bit-docid]) ;;
    … … AC_ARG_ENABLE([64bit_docid],  
    603603  [enable_64bit_docid=no])
    604604
    605605AC_ARG_ENABLE([64bit_termcount],
    606   [AS_HELP_STRING([--enable-64bit-termcount], [enable 64bit termcount [default=no]])],
     606  [AS_HELP_STRING([--enable-64bit-termcount], [enable 64bit termcount])],
    607607  [case ${enableval} in
    608608    yes|no) ;;
    609609  *) AC_MSG_ERROR([bad value ${enableval} for --enable-64bit-termcount]) ;;
    … … AC_ARG_ENABLE([64bit_termcount],  
    611611  [enable_64bit_termcount=no])
    612612
    613613AC_ARG_ENABLE([64bit_termpos],
    614   [AS_HELP_STRING([--enable-64bit-termpos], [enable 64bit termpos [default=no]])],
     614  [AS_HELP_STRING([--enable-64bit-termpos], [enable 64bit termpos])],
    615615  [case ${enableval} in
    616616    yes|no) ;;
    617617  *) AC_MSG_ERROR([bad value ${enableval} for --enable-64bit-termpos]) ;;
    … … dnl ***************************  
    830830
    831831dnl Check which database backends should be built.
    832832
    833 AC_DEFUN([_XAPIAN_BACKEND_ENABLE],
     833AC_DEFUN([XAPIAN_BACKEND_ENABLE],
    834834  [AC_ARG_ENABLE([backend_$1],
    835     [AS_HELP_STRING([--enable-backend-$1], [build the $1 database backend [default=$3]])],
     835    [AS_HELP_STRING([--disable-backend-$1], [don't build the $1 database backend])],
    836836    [case $enableval in
    837837      yes|no) ;;
    838838      *) AC_MSG_ERROR([Invalid option: '--enable-backend-$1=$enableval']) ;;
    839     esac], [enable_backend_$1=$2])
    840   ])
    841 
    842 AC_DEFUN([XAPIAN_BACKEND_ENABLE],
    843   [_XAPIAN_BACKEND_ENABLE([$1],
    844     m4_default([$2], [yes]),
    845     m4_default([$3], [yes]))
     839    esac], [enable_backend_$1=yes])
    846840  ])
    847841
    848842dnl When adding a new backend, update INSTALL too.
    … … case $host_os in  
    857851    default_enable_backend_remote=no
    858852    ;;
    859853esac
    860 XAPIAN_BACKEND_ENABLE([remote], [$default_enable_backend_remote], [yes (except for MSDOS)])
     854
     855AC_ARG_ENABLE([backend_remote],
     856    [AS_HELP_STRING([--disable-backend-remote], [don't build the $1 database backend [default=yes (except for MSDOS)]])],
     857    [case $enableval in
     858      yes|no) ;;
     859      *) AC_MSG_ERROR([Invalid option: '--enable-backend-remote=$enableval']) ;;
     860    esac], [enable_backend_remote=$default_enable_backend_remote])
    861861
    862862win32_need_lws2_32=0
    863863case $enable_backend_chert$enable_backend_glass in