X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=648d8771b9198ca02f2fb995c66a461ba336aeff;hp=2e31e566537d3277329201cc4784fab95ee5b0e6;hb=e2dd4ac00b9979de34bd517fa57de56260d38755;hpb=20576886457235b84f80d3ac8eaf9fb36d306bf4

diff --git a/configure b/configure
index 2e31e566..648d8771 100755
--- a/configure
+++ b/configure
@@ -8,10 +8,17 @@ CFLAGS=${CFLAGS:--O2}
 CXXFLAGS=${CXXFLAGS:-\$(CFLAGS)}
 XAPIAN_CONFIG=${XAPIAN_CONFIG:-xapian-config-1.1 xapian-config}
 
+# We don't allow the EMACS or GZIP Makefile variables inherit values
+# from the environment as we do with CC and CXX above. The reason is
+# that these names as environment variables have existing uses other
+# than the program name that we want. (EMACS is set to 't' when a
+# shell is running within emacs and GZIP specifies arguments to pass
+# on the gzip command line).
+
 # Set the defaults for values the user can specify with command-line
 # options.
 PREFIX=/usr/local
-LIBDIR=${PREFIX}/lib
+LIBDIR=
 
 usage ()
 {
@@ -50,7 +57,6 @@ Additionally, various options can be specified on the configure
 command line.
 
 	--prefix=PREFIX	Install files in PREFIX [$PREFIX]
-	--libdir=LIBDIR	Install libraries in LIBDIR [$LIBDIR]
 
 By default, "make install" will install the resulting program to
 $PREFIX/bin, documentation to $PREFIX/man, etc. You can
@@ -59,6 +65,10 @@ specify an installation prefix other than $PREFIX using
 
 	./configure --prefix=\$HOME
 
+Fine tuning of some installation directories is available:
+
+	--libdir=DIR	Install libraries in LIBDIR [PREFIX/lib]
+
 EOF
 }
 
@@ -165,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
 
@@ -231,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
@@ -239,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
 
@@ -266,23 +285,41 @@ CC = ${CC}
 # The C++ compiler to use
 CXX = ${CXX}
 
+# Command to execute emacs from Makefiles
+EMACS = emacs --quick
+
 # Default FLAGS for C compiler (can be overridden by user such as "make CFLAGS=-g")
 CFLAGS = ${CFLAGS}
 
 # Default FLAGS for C++ compiler (can be overridden by user such as "make CXXFLAGS=-g")
 CXXFLAGS = ${CXXFLAGS}
 
+# Flags to enable warnings when using the C++ compiler
+WARN_CXXFLAGS=-Wall -Wextra -Wwrite-strings -Wswitch-enum
+
+# Flags to enable warnings when using the C compiler
+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
-libdir = ${LIBDIR}
+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
 
 # Whether the getline function is available (if not, then notmuch will
 # build its own version)