diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2009-11-22 00:44:31 +0000 |
---|---|---|
committer | Carl Worth <cworth@cworth.org> | 2009-11-22 05:36:36 +0100 |
commit | 986f6c98244610da6bba88d0c92895b9758973ee (patch) | |
tree | 8da16b03bf27006f4fbbef60c3f273741c35d14b /configure | |
parent | 3e4ab913db33991177f8da7ae2d6ce7d11791678 (diff) |
notmuch-new: Only install SIGALRM if not running under gdb
I felt sorry for Carl trying to step through an exception from xapian
and suffering from the SIGALARMs..
We can detect if the user launched notmuch under a debugger by either
checking our cmdline for the presence of the gdb string or querying if
valgrind is controlling our process. For the latter we need to add a
compile time check for the valgrind development library, and so add the
initial support to build Makefile.config from configure.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Carl Worth <cworth@cworth.org>
[ickle: And do not install the timer when under the debugger]
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 21 |
1 files changed, 17 insertions, 4 deletions
@@ -53,6 +53,14 @@ else errors=$((errors + 1)) fi +if pkg-config --modversion valgrind > /dev/null 2>&1; then + echo "Checking for valgrind development files... Yes." + have_valgrind=-DHAVE_VALGRIND +else + echo "Checking for valgrind development files... No." + have_valgrind= +fi + if [ $errors -gt 0 ]; then cat <<EOF @@ -108,7 +116,8 @@ configure again to ensure the packages can be found, or simply run EOF exit 1 -else +fi + cat <<EOF All required packages were found. You may now run the following @@ -118,6 +127,10 @@ commands to compile and install notmuch: sudo make install EOF - exit 0 -fi -cat <<EOF + +# construct the Makefile.config +cat > Makefile.config <<EOF +prefix = /usr/local +bash_completion_dir = /etc/bash_completion.d +CFLAGS += ${have_valgrind} +EOF |