equal
deleted
inserted
replaced
120 echo "Using autoconf at ${AUTOCONF} [$autoconf_version]" |
120 echo "Using autoconf at ${AUTOCONF} [$autoconf_version]" |
121 |
121 |
122 if test "x$CUSTOM_CONFIG_DIR" != x; then |
122 if test "x$CUSTOM_CONFIG_DIR" != x; then |
123 # Generate configure script with custom hooks compiled in. |
123 # Generate configure script with custom hooks compiled in. |
124 custom_patcher='sed -e "s|#CUSTOM_AUTOCONF_INCLUDE|m4_include([$custom_hook])|"' |
124 custom_patcher='sed -e "s|#CUSTOM_AUTOCONF_INCLUDE|m4_include([$custom_hook])|"' |
|
125 custom_script_dir_include="-I$CUSTOM_CONFIG_DIR" |
125 else |
126 else |
126 custom_patcher='cat' |
127 custom_patcher='cat' |
|
128 custom_script_dir_include="" |
127 fi |
129 fi |
128 |
130 |
129 mkdir -p $build_support_dir |
131 mkdir -p $build_support_dir |
130 # Call autoconf but replace the "magic" variable in configure.ac if requested. |
132 # Call autoconf but replace the "magic" variable in configure.ac if requested. |
|
133 |
131 cat $conf_script_dir/configure.ac | eval $custom_patcher | \ |
134 cat $conf_script_dir/configure.ac | eval $custom_patcher | \ |
132 ${AUTOCONF} -W all -I$conf_script_dir - > $generated_script |
135 ${AUTOCONF} -W all $custom_script_dir_include -I$conf_script_dir - \ |
|
136 > $generated_script |
133 rm -rf autom4te.cache |
137 rm -rf autom4te.cache |
134 |
138 |
135 # Sanity check |
139 # Sanity check |
136 if test ! -s $generated_script; then |
140 if test ! -s $generated_script; then |
137 echo "Error: Failed to generate runnable configure script" 1>&2 |
141 echo "Error: Failed to generate runnable configure script" 1>&2 |