Ticket #8744: reconfigure.patch

configure

@@ -9 +9 @@
 # * detect whether the chosen backend is available (e.g. call sdl-config)
 # * ....
 
+# Save the current environment variables for next runs
+SAVE_CONFIGFLAGS=$@
+SAVE_LDFLAGS=$LDFLAGS
+SAVE_CXX=$CXX
+SAVE_CXXFLAGS=$CXXFLAGS
+SAVE_CPPFLAGS=$CPPFLAGS
 
 # use environment vars if set
 CXXFLAGS="$CXXFLAGS $CPPFLAGS"
@@ -1625 +1631 @@
 OBJS += $OBJS
 DEFINES += $DEFINES
 LDFLAGS += $LDFLAGS
+
+SAVE_CONFIGFLAGS := $SAVE_CONFIGFLAGS
+SAVE_LDFLAGS     := $SAVE_LDFLAGS
+SAVE_CXX         := $SAVE_CXX
+SAVE_CXXFLAGS    := $SAVE_CXXFLAGS
+SAVE_CPPFLAGS    := $SAVE_CPPFLAGS
 EOF
 
 #

Makefile

@@ -16 +16 @@
 MODULE_DIRS :=
 
 # Load the make rules generated by configure
-include config.mk
+sinclude config.mk
 
 CXXFLAGS:= -Wall $(CXXFLAGS)
 CXXFLAGS+= -Wno-long-long -Wno-multichar -Wno-unknown-pragmas
@@ -44 +44 @@
 
 # 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
+        @echo "Running $(srcdir)/configure with the last specified parameters"
+        @echo "or if you didn't run it yet with, no parameters, check"
+        @echo "$(srcdir)/configure --help for a list of parameters."
+        @sleep 2s
+        @LDFLAGS=$(SAVE_LDFLAGS) CXX=$(SAVE_CXX) CXXFLAGS=$(SAVE_CXXFLAGS) CPPFLAGS=$(SAVE_CPPFLAGS) \
+                $(srcdir)/configure $(SAVE_CONFIGFLAGS)
 
 install: all
         $(INSTALL) -d "$(DESTDIR)$(BINDIR)"