move mschap specific rules to top-level, and make top-level more generic

and don't bother re-running 'configure'.  It doesn't work
half of the time.

diff --git a/Makefile b/Makefile
index c48ad4d906666709f5cca49bc0c262de129bc680..a914d2af73cb510bb048708c4d7ae0e54f2c766c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -311,10 +311,18 @@ endif
 ifneq "$(wildcard config.log)" ""
 CONFIGURE_ARGS    := $(shell head -10 config.log | grep '^  \$$' | sed 's/^....//;s:.*configure ::')
 
+#
+#  ONLY re-run "configure" if we're told to do that.  Otherwise every
+#  change to a configure file will have it try to re-run the local
+#  configure script, which doesn't always work.
+#
 src/%all.mk: src/%all.mk.in src/%configure
-       @echo CONFIGURE $(dir $@)
-       @rm -f ./config.cache $(dir $<)/config.cache
-       @cd $(dir $<) && ./configure $(CONFIGURE_ARGS)
+       @echo WARNING: $@ is out of date.  Please re-run 'configure'
+
+#      @echo CONFIGURE $(dir $@)
+#      @rm -f ./config.cache $(dir $<)/config.cache
+#      @cd $(dir $<) && ./configure $(CONFIGURE_ARGS)
+
 endif
 
 .PHONY: check-includes

diff --git a/src/modules/rlm_mschap/all.mk b/src/modules/rlm_mschap/all.mk
index b69d4f701b18c0e3e57bc03589f55a56a5bc2662..ed6fb82a13b250fc04d525d49450e91a7917ee81 100644 (file)
--- a/src/modules/rlm_mschap/all.mk
+++ b/src/modules/rlm_mschap/all.mk
@@ -1,5 +1 @@
 SUBMAKEFILES := rlm_mschap.mk smbencrypt.mk
-
-src/modules/rlm_mschap/rlm_mschap.mk: src/modules/rlm_mschap/rlm_mschap.mk.in src/modules/rlm_mschap/configure
-       ${Q}echo CONFIGURE $(dir $<)
-       ${Q}cd $(dir $<) && ./configure $(CONFIGURE_ARGS)