configure: Add support for a --includedir option

[notmuch] / configure

diff --git a/configure b/configure
index d56caaddd91cb2db29d92744f1977d232955feda..a0746dfa6790fd70de361eb3e987558505096209 100755 (executable)
--- a/configure
+++ b/configure
@@ -67,7 +67,13 @@ specify an installation prefix other than $PREFIX using
 
 Fine tuning of some installation directories is available:
 
-       --libdir=DIR    Install libraries in LIBDIR [PREFIX/lib]
+       --libdir=DIR            Install libraries to DIR [PREFIX/lib]
+       --includedir=DIR        Install header files to DIR [PREFIX/include]
+
+Additional options are accepted for compatibility with other
+configure-script calling conventions, but don't do anything yet:
+
+       --build=<cpu>-<vendor>-<os>     Currently ignored
 
 EOF
 }
@@ -81,8 +87,26 @@ for option; do
        PREFIX="${option#*=}"
     elif [ "${option%%=*}" = '--libdir' ] ; then
        LIBDIR="${option#*=}"
+    elif [ "${option%%=*}" = '--includedir' ] ; then
+       INCLUDEDIR="${option#*=}"
+    elif [ "${option%%=*}" = '--build' ] ; then
+       build_option="${option#*=}"
+       case ${build_option} in
+           *-*-*) ;;
+           *)
+               echo "Unrecognized value for --build option: ${build_option}"
+               echo "Should be: <cpu>-<vendor>-<os>"
+               echo "See:"
+               echo "  $0 --help"
+               echo ""
+               exit 1
+       esac
+       build_cpu=${build_option%%-*}
+       build_option=${build_option#*-}
+       build_vendor=${build_option%%-*}
+       build_os=${build_option#*-}
     else
-       echo "Unrecognized option: ${option}."
+       echo "Unrecognized option: ${option}"
        echo "See:"
        echo "  $0 --help"
        echo ""
@@ -175,6 +199,15 @@ else
     emacs_lispdir='$(prefix)/share/emacs/site-lisp'
 fi
 
+printf "Checking if emacs is available... "
+if emacs --quick --batch > /dev/null 2>&1; then
+    printf "Yes.\n"
+    have_emacs=1
+else
+    printf "No (so will not byte-compile emacs code)\n"
+    have_emacs=0
+fi
+
 if [ $errors -gt 0 ]; then
     cat <<EOF
 
@@ -241,7 +274,7 @@ EOF
 fi
 
 printf "Checking for getline... "
-if ${CC} -o config/have_getline config/have_getline.c > /dev/null 2>&1
+if ${CC} -o compat/have_getline compat/have_getline.c > /dev/null 2>&1
 then
     printf "Yes.\n"
     have_getline=1
@@ -249,7 +282,7 @@ else
     printf "No (will use our own instead).\n"
     have_getline=0
 fi
-rm -f config/have_getline
+rm -f compat/have_getline
 
 cat <<EOF
 
@@ -294,12 +327,18 @@ WARN_CFLAGS=\$(WARN_CXXFLAGS) -Wmissing-declarations
 # The prefix to which notmuch should be installed
 prefix = ${PREFIX}
 
-# The directory to which notmuch libraries should be installed
+# The directory to which libraries should be installed
 libdir = ${LIBDIR:=\$(prefix)/lib}
 
+# The directory to which header files should be installed
+includedir = ${INCLUDEDIR:=\$(prefix)/lib}
+
 # The directory to which emacs lisp files should be installed
 emacs_lispdir=${emacs_lispdir}
 
+# Whether there's an emacs binary available for byte-compiling
+HAVE_EMACS = ${have_emacs}
+
 # The directory to which desktop files should be installed
 desktop_dir = \$(prefix)/share/applications