make/Init.gmk

*** 135,153 ****
      SEQUENTIAL_TARGETS := $(filter dist-clean clean%, $(MAIN_TARGETS))
      PARALLEL_TARGETS := $(filter-out $(SEQUENTIAL_TARGETS), $(MAIN_TARGETS))
  
      # The spec files depend on the autoconf source code. This check makes sure
      # the configuration is up to date after changes to configure.
!     CUSTOM_CONFIG_DIR ?= $(topdir)/closed/autoconf
! 
!     $(SPECS): $(wildcard $(topdir)/common/autoconf/*) $(wildcard $(CUSTOM_CONFIG_DIR)/*)
          ifeq ($(CONF_CHECK), fail)
!           @echo "Error: The configuration is not up to date for '$(lastword $(subst /, , $(dir $@)))'."
            $(call PrintConfCheckFailed)
            @exit 2
          else ifeq ($(CONF_CHECK), auto)
!           @echo "Note: The configuration is not up to date for '$(lastword $(subst /, , $(dir $@)))'."
            @( cd $(topdir) && \
                $(MAKE) $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -f $(topdir)/make/Init.gmk \
                SPEC=$@ HAS_SPEC=true ACTUAL_TOPDIR=$(topdir) \
                reconfigure )
          else ifeq ($(CONF_CHECK), ignore)
--- 135,154 ----
      SEQUENTIAL_TARGETS := $(filter dist-clean clean%, $(MAIN_TARGETS))
      PARALLEL_TARGETS := $(filter-out $(SEQUENTIAL_TARGETS), $(MAIN_TARGETS))
  
      # The spec files depend on the autoconf source code. This check makes sure
      # the configuration is up to date after changes to configure.
!     $(SPECS): $(wildcard $(topdir)/make/autoconf/*) \
!             $(if $(CUSTOM_CONFIG_DIR), $(wildcard $(CUSTOM_CONFIG_DIR)/*))
          ifeq ($(CONF_CHECK), fail)
!           @echo Error: The configuration is not up to date for \
!               "'$(lastword $(subst /, , $(dir $@)))'."
            $(call PrintConfCheckFailed)
            @exit 2
          else ifeq ($(CONF_CHECK), auto)
!           @echo Note: The configuration is not up to date for \
!               "'$(lastword $(subst /, , $(dir $@)))'."
            @( cd $(topdir) && \
                $(MAKE) $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -f $(topdir)/make/Init.gmk \
                SPEC=$@ HAS_SPEC=true ACTUAL_TOPDIR=$(topdir) \
                reconfigure )
          else ifeq ($(CONF_CHECK), ignore)
*** 264,273 ****
--- 265,275 ----
            $(ECHO) "Re-running configure using arguments '$(CONFIGURE_COMMAND_LINE)'"
          else
            $(ECHO) "Re-running configure using default settings"
          endif
          ( cd $(OUTPUTDIR) && PATH="$(ORIGINAL_PATH)" \
+             CUSTOM_CONFIG_DIR="$(CUSTOM_CONFIG_DIR)" \
              $(BASH) $(CONFIGURE_CMD) $(CONFIGURE_COMMAND_LINE) )
  
    ##############################################################################
    # The main target, for delegating into Main.gmk
    ##############################################################################