From: Carl Worth <cworth@cworth.org>
Date: Tue, 6 Apr 2010 21:38:04 +0000 (-0700)
Subject: Merge branch 'debian' into rebuild
X-Git-Tag: debian-0.1-1~19
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=e2dd4ac00b9979de34bd517fa57de56260d38755;hp=-c

Merge branch 'debian' into rebuild

Conflicts:

  Makefile.local: The Makefiles were all recently re-written on
		  master, but I did ensure that the changes from the
		  debian branch were all implemented here, (in
		  particular, installing the emacs files from "make
		  install").

  configure: I've reverted one change as part of this merge:

		commit 9f99a301b158dc1ed1c8c6754db1d57e3b0becf4

		Remove ./configure failure for unrecognized options

	     I'd much rather find what options the Debian scripts pass
	     and either implement them or at least make the explicitly
	     do nothing. One of the things that often annoyed me about
	     gnu autoconf-generated configure scripts was the silent
	     ignoring of unknown options, (which was very unhelpful in
	     the case of mistyped options on the command line).
---

e2dd4ac00b9979de34bd517fa57de56260d38755