From b820b661c7b691cfcb86408954cde6f71da5654e Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 6 Nov 2007 17:23:33 +0000
Subject: Patch #1826459: Make: reconfigure on configure change (saving
 environment)

svn-id: r29435
---
 Makefile | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 8bd42a27d7..79bf2b431e 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ MODULES     :=
 MODULE_DIRS :=
 
 # Load the make rules generated by configure
-include config.mk
+-include config.mk
 
 CXXFLAGS:= -Wall $(CXXFLAGS)
 CXXFLAGS+= -Wno-long-long -Wno-multichar -Wno-unknown-pragmas
@@ -44,9 +44,14 @@ include $(srcdir)/Makefile.common
 
 # check if configure has been run or has been changed since last run
 config.mk: $(srcdir)/configure
-	@echo "You need to run ./configure before you can run make"
-	@echo "Either you haven't run it before or it has changed."
-	@exit 1
+ifdef CONFIG_MK_IS_PRESENT
+	@echo "Running $(srcdir)/configure with the last specified parameters"
+	@sleep 2s
+	@LDFLAGS=$(SAVED_LDFLAGS) CXX=$(SAVED_CXX) CXXFLAGS=$(SAVED_CXXFLAGS) CPPFLAGS=$(SAVED_CPPFLAGS) \
+		$(srcdir)/configure $(SAVED_CONFIGFLAGS)
+else
+	$(error You need to run $(srcdir)/configure before you can run make. Check $(srcdir)/configure --help for a list of parameters)
+endif
 
 install: all
 	$(INSTALL) -d "$(DESTDIR)$(BINDIR)"
-- 
cgit v1.2.3