X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=df1636d2f576a4031f9b2e8d6cec9e2846120410;hp=d240b6acf8bda20b033e62ef1beda4c3cebe38d3;hb=bb5211684654b7cf54f842990a733a64fe01d612;hpb=3f406fdefca0400c1c2023674dfc5b36db55a1e7

diff --git a/configure b/configure
index d240b6ac..df1636d2 100755
--- a/configure
+++ b/configure
@@ -8,9 +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=
 
 usage ()
 {
@@ -51,12 +59,16 @@ command line.
 	--prefix=PREFIX	Install files in PREFIX [$PREFIX]
 
 By default, "make install" will install the resulting program to
-$PREFIX/bin, documentation to $PREFIX/share, etc. You can
+$PREFIX/bin, documentation to $PREFIX/man, etc. You can
 specify an installation prefix other than $PREFIX using
 --prefix, for instance:
 
 	./configure --prefix=\$HOME
 
+Fine tuning of some installation directories is available:
+
+	--libdir=DIR	Install libraries in LIBDIR [PREFIX/lib]
+
 EOF
 }
 
@@ -67,6 +79,8 @@ for option; do
 	exit 0
     elif [ "${option%%=*}" = '--prefix' ] ; then
 	PREFIX="${option#*=}"
+    elif [ "${option%%=*}" = '--libdir' ] ; then
+	LIBDIR="${option#*=}"
     else
 	echo "Unrecognized option: ${option}."
 	echo "See:"
@@ -262,18 +276,54 @@ CC = ${CC}
 # The C++ compiler to use
 CXX = ${CXX}
 
+# Command to execute emacs from Makefiles
+EMACS = emacs --quick
+
+# Command to execute gzip from Makefiles
+gzip = gzip
+
+# Command to create a directory
+MKDIR = install -d
+
+# Command to install an executable
+INSTALL-BIN = install
+
+# Command to install a non-executable file (documentation, etc.)
+INSTALL-DATA = install -m0644
+
+# Command to create a symbolic link
+SYMLINK = ln -sf
+
 # 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:=\$(prefix)/lib}
+
 # The directory to which emacs lisp files should be installed
 emacs_lispdir=${emacs_lispdir}
 
+# The directory to which desktop files should be installed
+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)
 HAVE_GETLINE = ${have_getline}