| @@ -1,76 +1,62 @@ | | | @@ -1,76 +1,62 @@ |
| 1 | $NetBSD: patch-aa,v 1.3 2008/08/09 15:21:07 tnn Exp $ | | 1 | $NetBSD: patch-aa,v 1.4 2009/06/09 02:46:10 obache Exp $ |
| 2 | | | 2 | |
| 3 | --- configure.orig 2008-03-19 18:35:58.000000000 +0100 | | 3 | --- configure.orig 2008-12-22 04:26:01.000000000 +0000 |
| 4 | +++ configure | | 4 | +++ configure |
| 5 | @@ -21319,54 +21319,8 @@ _ACEOF | | 5 | @@ -21964,57 +21964,8 @@ fi |
| 6 | fi | | | |
| 7 | | | 6 | |
| 8 | | | 7 | |
| 9 | -# Checks for functions (often defined as inlines in compiler.h) | | 8 | # Checks for functions (often defined as inlines in compiler.h) |
| 10 | -{ echo "$as_me:$LINENO: checking for inb" >&5 | | 9 | -{ $as_echo "$as_me:$LINENO: checking for inb" >&5 |
| 11 | -echo $ECHO_N "checking for inb... $ECHO_C" >&6; } | | 10 | -$as_echo_n "checking for inb... " >&6; } |
| 12 | -cat >conftest.$ac_ext <<_ACEOF | | 11 | -cat >conftest.$ac_ext <<_ACEOF |
| 13 | -/* confdefs.h. */ | | 12 | -/* confdefs.h. */ |
| 14 | -_ACEOF | | 13 | -_ACEOF |
| 15 | -cat confdefs.h >>conftest.$ac_ext | | 14 | -cat confdefs.h >>conftest.$ac_ext |
| 16 | -cat >>conftest.$ac_ext <<_ACEOF | | 15 | -cat >>conftest.$ac_ext <<_ACEOF |
| 17 | -/* end confdefs.h. */ | | 16 | -/* end confdefs.h. */ |
| 18 | - | | 17 | - |
| 19 | -#include "util/AsmMacros.h" | | 18 | -#include "util/AsmMacros.h" |
| 20 | - | | 19 | - |
| 21 | -int main() { | | 20 | -int main() { |
| 22 | - int x = inb(0); | | 21 | - int x = inb(0); |
| 23 | - return x; | | 22 | - return x; |
| 24 | -} | | 23 | -} |
| 25 | - | | 24 | - |
| 26 | -_ACEOF | | 25 | -_ACEOF |
| 27 | -rm -f conftest.$ac_objext conftest$ac_exeext | | 26 | -rm -f conftest.$ac_objext conftest$ac_exeext |
| 28 | -if { (ac_try="$ac_link" | | 27 | -if { (ac_try="$ac_link" |
| 29 | -case "(($ac_try" in | | 28 | -case "(($ac_try" in |
| 30 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | | 29 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 31 | - *) ac_try_echo=$ac_try;; | | 30 | - *) ac_try_echo=$ac_try;; |
| 32 | -esac | | 31 | -esac |
| 33 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | | 32 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| | | 33 | -$as_echo "$ac_try_echo") >&5 |
| 34 | - (eval "$ac_link") 2>conftest.er1 | | 34 | - (eval "$ac_link") 2>conftest.er1 |
| 35 | - ac_status=$? | | 35 | - ac_status=$? |
| 36 | - grep -v '^ *+' conftest.er1 >conftest.err | | 36 | - grep -v '^ *+' conftest.er1 >conftest.err |
| 37 | - rm -f conftest.er1 | | 37 | - rm -f conftest.er1 |
| 38 | - cat conftest.err >&5 | | 38 | - cat conftest.err >&5 |
| 39 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | | 39 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 40 | - (exit $ac_status); } && { | | 40 | - (exit $ac_status); } && { |
| 41 | - test -z "$ac_c_werror_flag" || | | 41 | - test -z "$ac_c_werror_flag" || |
| 42 | - test ! -s conftest.err | | 42 | - test ! -s conftest.err |
| 43 | - } && test -s conftest$ac_exeext && | | 43 | - } && test -s conftest$ac_exeext && { |
| 44 | - $as_test_x conftest$ac_exeext; then | | 44 | - test "$cross_compiling" = yes || |
| | | 45 | - $as_test_x conftest$ac_exeext |
| | | 46 | - }; then |
| 45 | - HAVE_INB=yes | | 47 | - HAVE_INB=yes |
| 46 | -else | | 48 | -else |
| 47 | - echo "$as_me: failed program was:" >&5 | | 49 | - $as_echo "$as_me: failed program was:" >&5 |
| 48 | -sed 's/^/| /' conftest.$ac_ext >&5 | | 50 | -sed 's/^/| /' conftest.$ac_ext >&5 |
| 49 | - | | 51 | - |
| 50 | HAVE_INB=no | | 52 | HAVE_INB=no |
| 51 | -fi | | 53 | -fi |
| 52 | | | 54 | |
| | | 55 | -rm -rf conftest.dSYM |
| 53 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | | 56 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
| 54 | - conftest$ac_exeext conftest.$ac_ext | | 57 | - conftest$ac_exeext conftest.$ac_ext |
| 55 | -{ echo "$as_me:$LINENO: result: $HAVE_INB" >&5 | | 58 | -{ $as_echo "$as_me:$LINENO: result: $HAVE_INB" >&5 |
| 56 | -echo "${ECHO_T}$HAVE_INB" >&6; } | | 59 | -$as_echo "$HAVE_INB" >&6; } |
| 57 | if test x$HAVE_INB = xyes; then | | 60 | if test x$HAVE_INB = xyes; then |
| 58 | BUILD_UTILS_TRUE= | | 61 | BUILD_UTILS_TRUE= |
| 59 | BUILD_UTILS_FALSE='#' | | 62 | BUILD_UTILS_FALSE='#' |
| 60 | @@ -21506,16 +21460,8 @@ echo $ECHO_N "checking for $XORG_SGML_PA | | | |
| 61 | if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then | | | |
| 62 | echo $ECHO_N "(cached) $ECHO_C" >&6 | | | |
| 63 | else | | | |
| 64 | - test "$cross_compiling" = yes && | | | |
| 65 | - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 | | | |
| 66 | -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} | | | |
| 67 | - { (exit 1); exit 1; }; } | | | |
| 68 | -if test -r "$XORG_SGML_PATH/X11/defs.ent"; then | | | |
| 69 | - eval "$as_ac_File=yes" | | | |
| 70 | -else | | | |
| 71 | eval "$as_ac_File=no" | | | |
| 72 | fi | | | |
| 73 | -fi | | | |
| 74 | ac_res=`eval echo '${'$as_ac_File'}'` | | | |
| 75 | { echo "$as_me:$LINENO: result: $ac_res" >&5 | | | |
| 76 | echo "${ECHO_T}$ac_res" >&6; } | | | |