X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=36f3f606814417a60236e1eadb78c4c0f86c0857;hp=d399457a92f36cd75810d0d226143852f2a3a811;hb=0a32741fceb7778ced34064eacb7b5aac2c71638;hpb=ab8d0e572537006a4e1dafa266075ed0d848c80f

diff --git a/configure b/configure
index d399457a..36f3f606 100755
--- a/configure
+++ b/configure
@@ -55,6 +55,8 @@ subdirs="${subdirs} bindings"
 # the directory structure and copy Makefiles.
 if [ "$srcdir" != "." ]; then
 
+    NOTMUCH_BUILDDIR=$PWD
+
     for dir in . ${subdirs}; do
 	mkdir -p "$dir"
 	cp "$srcdir"/"$dir"/Makefile.local "$dir"
@@ -78,6 +80,8 @@ if [ "$srcdir" != "." ]; then
        "$srcdir"/bindings/python-cffi/notmuch2 \
        "$srcdir"/bindings/python-cffi/setup.py \
        bindings/python-cffi/
+else
+    NOTMUCH_BUILDDIR=$NOTMUCH_SRCDIR
 fi
 
 # Set several defaults (optionally specified by the user in
@@ -308,12 +312,22 @@ for option; do
 	true
     elif [ "${option%%=*}" = '--host' ] ; then
 	true
+    elif [ "${option%%=*}" = '--bindir' ] ; then
+	true
+    elif [ "${option%%=*}" = '--sbindir' ] ; then
+	true
     elif [ "${option%%=*}" = '--datadir' ] ; then
 	true
     elif [ "${option%%=*}" = '--localstatedir' ] ; then
 	true
+    elif [ "${option%%=*}" = '--sharedstatedir' ] ; then
+	true
     elif [ "${option%%=*}" = '--libexecdir' ] ; then
 	true
+    elif [ "${option%%=*}" = '--exec-prefix' ] ; then
+	true
+    elif [ "${option%%=*}" = '--program-prefix' ] ; then
+	true
     elif [ "${option}" = '--disable-maintainer-mode' ] ; then
 	true
     elif [ "${option}" = '--disable-dependency-tracking' ] ; then
@@ -396,6 +410,18 @@ EOF
     exit 1
 fi
 
+printf "C compiler supports address sanitizer... "
+test_cmdline="${CC} ${CFLAGS} ${CPPFLAGS} -fsanitize=address minimal.c ${LDFLAGS} -o minimal"
+if ${test_cmdline} >/dev/null 2>&1 && ./minimal
+then
+    printf "Yes.\n"
+    have_asan=1
+else
+    printf "Nope, skipping those tests.\n"
+    have_asan=0
+fi
+unset test_cmdline
+
 printf "Reading libnotmuch version from source... "
 cat > _libversion.c <<EOF
 #include <stdio.h>
@@ -1247,6 +1273,7 @@ cat > Makefile.config <<EOF
 # directory (the current directory at the time configure was run).
 srcdir = ${srcdir}
 NOTMUCH_SRCDIR = ${NOTMUCH_SRCDIR}
+NOTMUCH_BUILDDIR = ${NOTMUCH_BUILDDIR}
 
 # subdirectories to build
 subdirs = ${subdirs}
@@ -1533,6 +1560,9 @@ NOTMUCH_GMIME_X509_CERT_VALIDITY=${gmime_x509_cert_validity}
 # Whether GMime can verify signatures when decrypting with a session key:
 NOTMUCH_GMIME_VERIFY_WITH_SESSION_KEY=${gmime_verify_with_session_key}
 
+# Does the C compiler support the address sanitizer
+NOTMUCH_HAVE_ASAN=${have_asan}
+
 # do we have man pages?
 NOTMUCH_HAVE_MAN=$((have_sphinx))