| 1 | diff -u -r ../fish-2.1.1/configure ./configure |
| 2 | --- ../fish-2.1.1/configure 2014-09-25 09:11:05.000000000 -0400 |
| 3 | +++ ./configure 2015-02-05 17:35:51.994415663 -0500 |
| 4 | @@ -3221,10 +3221,7 @@ |
| 5 | $as_echo_n "checking if we are compiling against glibc... " >&6; } |
| 6 | |
| 7 | if test "$cross_compiling" = yes; then : |
| 8 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| 9 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| 10 | -as_fn_error $? "cannot run test program while cross compiling |
| 11 | -See \`config.log' for more details" "$LINENO" 5; } |
| 12 | + glibc=no |
| 13 | else |
| 14 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 15 | /* end confdefs.h. */ |
| 16 | @@ -3536,13 +3533,7 @@ |
| 17 | if ${ac_cv_file__proc_self_stat+:} false; then : |
| 18 | $as_echo_n "(cached) " >&6 |
| 19 | else |
| 20 | - test "$cross_compiling" = yes && |
| 21 | - as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 |
| 22 | -if test -r "/proc/self/stat"; then |
| 23 | ac_cv_file__proc_self_stat=yes |
| 24 | -else |
| 25 | - ac_cv_file__proc_self_stat=no |
| 26 | -fi |
| 27 | fi |
| 28 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__proc_self_stat" >&5 |
| 29 | $as_echo "$ac_cv_file__proc_self_stat" >&6; } |
| 30 | @@ -5218,10 +5209,7 @@ |
| 31 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if realpath accepts null for its second argument" >&5 |
| 32 | $as_echo_n "checking if realpath accepts null for its second argument... " >&6; } |
| 33 | if test "$cross_compiling" = yes; then : |
| 34 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| 35 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| 36 | -as_fn_error $? "cannot run test program while cross compiling |
| 37 | -See \`config.log' for more details" "$LINENO" 5; } |
| 38 | + have_realpath_null=yes |
| 39 | else |
| 40 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 41 | /* end confdefs.h. */ |
| 42 | @@ -5330,10 +5318,7 @@ |
| 43 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if fwprintf is broken" >&5 |
| 44 | $as_echo_n "checking if fwprintf is broken... " >&6; } |
| 45 | if test "$cross_compiling" = yes; then : |
| 46 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| 47 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| 48 | -as_fn_error $? "cannot run test program while cross compiling |
| 49 | -See \`config.log' for more details" "$LINENO" 5; } |
| 50 | + echo "no" |
| 51 | else |
| 52 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 53 | /* end confdefs.h. */ |