Merge branch 'debian' into rebuild

[notmuch] / configure

diff --git a/configure b/configure
index 64038f87aededde4c44448fe9e303dbba151d97f..648d8771b9198ca02f2fb995c66a461ba336aeff 100755 (executable)
--- a/configure
+++ b/configure
@@ -175,6 +175,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 +250,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 +258,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
 
@@ -279,9 +288,6 @@ CXX = ${CXX}
 # Command to execute emacs from Makefiles
 EMACS = emacs --quick
 
-# Command to execute gzip from Makefiles
-gzip = gzip
-
 # Default FLAGS for C compiler (can be overridden by user such as "make CFLAGS=-g")
 CFLAGS = ${CFLAGS}
 
@@ -298,19 +304,22 @@ WARN_CFLAGS=\$(WARN_CXXFLAGS) -Wmissing-declarations
 prefix = ${PREFIX}
 
 # The directory to which notmuch libraries should be installed
-libdir = ${LIBDIR:=$PREFIX/lib}
+libdir = ${LIBDIR:=\$(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
+desktop_dir = \$(prefix)/share/applications
 
 # The directory to which bash completions files should be installed
 bash_completion_dir = /etc/bash_completion.d
 
 # The directory to which zsh completions files should be installed
-zsh_completion_dir = ${PREFIX}/share/zsh/functions/Completion/Unix
+zsh_completion_dir = \$(prefix)/share/zsh/functions/Completion/Unix
 
 # Whether the getline function is available (if not, then notmuch will
 # build its own version)