Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Upstream-Status: Pending |
| 2 | |
| 3 | Poky provides a list of site files in CONFIG_SITE whereas autoconf |
| 4 | only expects one file. This patch changes autoconf to accept a list of |
| 5 | them. |
| 6 | |
| 7 | RP 1/2/10 |
| 8 | |
| 9 | Updated for 2.68 version: the CONFIG_SITE var was not getting used at all |
| 10 | fixed the 2.68 code |
| 11 | Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/27 |
| 12 | |
| 13 | Index: autoconf-2.68/lib/autoconf/general.m4 |
| 14 | =================================================================== |
| 15 | --- autoconf-2.68.orig/lib/autoconf/general.m4 |
| 16 | +++ autoconf-2.68/lib/autoconf/general.m4 |
| 17 | @@ -1878,7 +1878,6 @@ AU_DEFUN([AC_VALIDATE_CACHED_SYSTEM_TUPL |
| 18 | m4_define([AC_SITE_LOAD], |
| 19 | [# Prefer an explicitly selected file to automatically selected ones. |
| 20 | ac_site_file1=NONE |
| 21 | -ac_site_file2=NONE |
| 22 | if test -n "$CONFIG_SITE"; then |
| 23 | # We do not want a PATH search for config.site. |
| 24 | case $CONFIG_SITE in @%:@(( |
| 25 | @@ -1886,14 +1885,8 @@ if test -n "$CONFIG_SITE"; then |
| 26 | */*) ac_site_file1=$CONFIG_SITE;; |
| 27 | *) ac_site_file1=./$CONFIG_SITE;; |
| 28 | esac |
| 29 | -elif test "x$prefix" != xNONE; then |
| 30 | - ac_site_file1=$prefix/share/config.site |
| 31 | - ac_site_file2=$prefix/etc/config.site |
| 32 | -else |
| 33 | - ac_site_file1=$ac_default_prefix/share/config.site |
| 34 | - ac_site_file2=$ac_default_prefix/etc/config.site |
| 35 | fi |
| 36 | -for ac_site_file in "$ac_site_file1" "$ac_site_file2" |
| 37 | +for ac_site_file in $ac_site_file1 |
| 38 | do |
| 39 | test "x$ac_site_file" = xNONE && continue |
| 40 | if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then |