Fix typo in notmuch.h documentation regarding database open modes

[notmuch] / configure

diff --git a/configure b/configure
index c52dd3bd2277a381f8dc874769b8d58bc1d4160e..5af7852379f494379a320043e9ebacb515c24ef2 100755 (executable)
--- a/configure
+++ b/configure
@@ -71,11 +71,17 @@ Fine tuning of some installation directories is available:
        --includedir=DIR        Install header files to DIR [PREFIX/include]
        --mandir=DIR            Install man pages to DIR [PREFIX/share/man]
        --sysconfdir=DIR        Read-only single-machine data [PREFIX/etc]
+       --emacslispdir=DIR      Emacs code [PREFIX/share/emacs/site-lisp]
 
 Additional options are accepted for compatibility with other
 configure-script calling conventions, but don't do anything yet:
 
        --build=<cpu>-<vendor>-<os>     Currently ignored
+       --infodir=DIR                   Currently ignored
+       --localstatedir=DIR             Currently ignored
+       --libexecdir=DIR                Currently ignored
+       --disable-maintainer-mode       Currently ignored
+       --disable-dependency-tracking   Currently ignored
 
 EOF
 }
@@ -95,6 +101,8 @@ for option; do
        MANDIR="${option#*=}"
     elif [ "${option%%=*}" = '--sysconfdir' ] ; then
        SYSCONFDIR="${option#*=}"
+    elif [ "${option%%=*}" = '--emacslispdir' ] ; then
+       EMACSLISPDIR="${option#*=}"
     elif [ "${option%%=*}" = '--build' ] ; then
        build_option="${option#*=}"
        case ${build_option} in
@@ -111,6 +119,16 @@ for option; do
        build_option=${build_option#*-}
        build_vendor=${build_option%%-*}
        build_os=${build_option#*-}
+    elif [ "${option%%=*}" = '--infodir' ] ; then
+       true
+    elif [ "${option%%=*}" = '--localstatedir' ] ; then
+       true
+    elif [ "${option%%=*}" = '--libexecdir' ] ; then
+       true
+    elif [ "${option}" = '--disable-maintainer-mode' ] ; then
+       true
+    elif [ "${option}" = '--disable-dependency-tracking' ] ; then
+       true
     else
        echo "Unrecognized option: ${option}"
        echo "See:"
@@ -199,10 +217,12 @@ else
     have_valgrind=0
 fi
 
-if pkg-config --modversion emacs > /dev/null 2>&1; then
-    emacs_lispdir=$(pkg-config emacs --variable sitepkglispdir)
-else
-    emacs_lispdir='$(prefix)/share/emacs/site-lisp'
+if [ -z "${EMACSLISPDIR}" ]; then
+    if pkg-config --modversion emacs > /dev/null 2>&1; then
+       EMACSLISPDIR=$(pkg-config emacs --variable sitepkglispdir)
+    else
+       EMACSLISPDIR='$(prefix)/share/emacs/site-lisp'
+    fi
 fi
 
 printf "Checking if emacs is available... "
@@ -337,7 +357,7 @@ prefix = ${PREFIX}
 libdir = ${LIBDIR:=\$(prefix)/lib}
 
 # The directory to which header files should be installed
-includedir = ${INCLUDEDIR:=\$(prefix)/lib}
+includedir = ${INCLUDEDIR:=\$(prefix)/include}
 
 # The directory to which man pages should be installed
 mandir = ${MANDIR:=\$(prefix)/share/man}
@@ -346,7 +366,7 @@ mandir = ${MANDIR:=\$(prefix)/share/man}
 sysconfdir = ${SYSCONFDIR:=\$(prefix)/etc}
 
 # The directory to which emacs lisp files should be installed
-emacs_lispdir=${emacs_lispdir}
+emacslispdir=${EMACSLISPDIR}
 
 # Whether there's an emacs binary available for byte-compiling
 HAVE_EMACS = ${have_emacs}