From: Alan T. DeKok Date: Thu, 4 Nov 2021 15:05:00 +0000 (-0400) Subject: move mschap specific rules to top-level, and make top-level more generic X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=582cc913271cc011c1fe756c962a88c019d492d3;p=thirdparty%2Ffreeradius-server.git 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 c48ad4d9066..a914d2af73c 100644 --- 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 b69d4f701b1..ed6fb82a13b 100644 --- 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)