From f6471ab3aa4e715d86431c84169cf9b47b72f024 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Thu, 30 Aug 2018 08:15:10 +0200
Subject: [PATCH] 8210150: Allow custom-hook.m4 to include files from
 CUSTOM_CONFIG_DIR

Reviewed-by: erikj
---
 make/autoconf/configure | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/make/autoconf/configure b/make/autoconf/configure
index f1b7e637304..e4f9a12c6d4 100644
--- a/make/autoconf/configure
+++ b/make/autoconf/configure
@@ -122,14 +122,18 @@ generate_configure_script() {
   if test "x$CUSTOM_CONFIG_DIR" != x; then
     # Generate configure script with custom hooks compiled in.
     custom_patcher='sed -e "s|#CUSTOM_AUTOCONF_INCLUDE|m4_include([$custom_hook])|"'
+    custom_script_dir_include="-I$CUSTOM_CONFIG_DIR"
   else
     custom_patcher='cat'
+    custom_script_dir_include=""
   fi
 
   mkdir -p $build_support_dir
   # Call autoconf but replace the "magic" variable in configure.ac if requested.
+
   cat $conf_script_dir/configure.ac | eval $custom_patcher | \
-      ${AUTOCONF} -W all -I$conf_script_dir - > $generated_script
+      ${AUTOCONF} -W all $custom_script_dir_include -I$conf_script_dir - \
+      > $generated_script
   rm -rf autom4te.cache
 
   # Sanity check