X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile;h=11e3a3d96293255e136ed3d06ab99557e7047340;hp=faaaec6419b9ae7ec4d96b1b0d28ceac00739446;hb=3b24b396c4c9178603dec5380b4e89f6795dee1f;hpb=c10085c77b407d9ea704f8b4f9e0a805f63e72cb

diff --git a/Makefile b/Makefile
index faaaec64..11e3a3d9 100644
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,10 @@
 all:
 
 # List all subdirectories here. Each contains its own Makefile.local
-subdirs = compat completion emacs lib
+subdirs = compat completion emacs lib test
 
 # We make all targets depend on the Makefiles themselves.
-global_deps = Makefile Makefile.local \
+global_deps = Makefile Makefile.config Makefile.local \
 	$(subdirs:%=%/Makefile) $(subdirs:%=%/Makefile.local)
 
 # Sub-directory Makefile.local fragments can append to these variables
@@ -15,6 +15,26 @@ global_deps = Makefile Makefile.local \
 extra_cflags :=
 extra_cxxflags :=
 
+# Get settings from the output of configure by running it to generate
+# Makefile.config if it doesn't exist yet.
+
+# If Makefile.config doesn't exist, then srcdir won't be
+# set. Conditionally set it (assuming a plain srcdir build) so that
+# the rule to generate Makefile.config can actually work.
+srcdir ?= .
+
+include Makefile.config
+Makefile.config: $(srcdir)/configure
+ifeq ($(configure_options),)
+	@echo ""
+	@echo "Note: Calling ./configure with no command-line arguments. This is often fine,"
+	@echo "      but if you want to specify any arguments (such as an alternate prefix"
+	@echo "      into which to install), call ./configure explicitly and then make again."
+	@echo "      See \"./configure --help\" for more details."
+	@echo ""
+endif
+	$(srcdir)/configure $(configure_options)
+
 # Finally, include all of the Makefile.local fragments where all the
 # real work is done.