| @@ -1,65 +1,21 @@ | | | @@ -1,65 +1,21 @@ |
1 | $NetBSD: patch-ab,v 1.3 2008/07/17 12:03:11 tnn Exp $ | | 1 | $NetBSD: patch-ab,v 1.4 2008/07/28 16:58:06 tnn Exp $ |
2 | | | 2 | |
3 | --- configure.orig 2008-06-18 04:26:05.000000000 +0200 | | 3 | --- configure.orig 2008-07-23 09:35:10.000000000 +0200 |
4 | +++ configure | | 4 | +++ configure |
5 | @@ -21857,16 +21857,8 @@ echo $ECHO_N "checking for ${sdkdir}/sar | | 5 | @@ -22026,16 +22026,8 @@ echo $ECHO_N "checking for ${sdkdir}/sar |
6 | if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then | | 6 | if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then |
7 | echo $ECHO_N "(cached) $ECHO_C" >&6 | | 7 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
8 | else | | 8 | else |
9 | - test "$cross_compiling" = yes && | | 9 | - test "$cross_compiling" = yes && |
10 | - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 | | 10 | - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 |
11 | -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} | | 11 | -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} |
12 | - { (exit 1); exit 1; }; } | | 12 | - { (exit 1); exit 1; }; } |
13 | -if test -r "${sdkdir}/sarea.h"; then | | 13 | -if test -r "${sdkdir}/sarea.h"; then |
14 | - eval "$as_ac_File=yes" | | 14 | - eval "$as_ac_File=yes" |
15 | -else | | 15 | -else |
16 | eval "$as_ac_File=no" | | 16 | eval "$as_ac_File=no" |
17 | fi | | 17 | fi |
18 | -fi | | 18 | -fi |
19 | ac_res=`eval echo '${'$as_ac_File'}'` | | 19 | ac_res=`eval echo '${'$as_ac_File'}'` |
20 | { echo "$as_me:$LINENO: result: $ac_res" >&5 | | 20 | { echo "$as_me:$LINENO: result: $ac_res" >&5 |
21 | echo "${ECHO_T}$ac_res" >&6; } | | 21 | echo "${ECHO_T}$ac_res" >&6; } |
22 | @@ -22530,12 +22522,12 @@ if test -n "$PKG_CONFIG"; then | | | |
23 | pkg_cv_DRI_MM_CFLAGS="$DRI_MM_CFLAGS" | | | |
24 | else | | | |
25 | if test -n "$PKG_CONFIG" && \ | | | |
26 | - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.3.1\"") >&5 | | | |
27 | - ($PKG_CONFIG --exists --print-errors "libdrm >= 2.3.1") 2>&5 | | | |
28 | + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.4.0\"") >&5 | | | |
29 | + ($PKG_CONFIG --exists --print-errors "libdrm >= 2.4.0") 2>&5 | | | |
30 | ac_status=$? | | | |
31 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | | | |
32 | (exit $ac_status); }; then | | | |
33 | - pkg_cv_DRI_MM_CFLAGS=`$PKG_CONFIG --cflags "libdrm >= 2.3.1" 2>/dev/null` | | | |
34 | + pkg_cv_DRI_MM_CFLAGS=`$PKG_CONFIG --cflags "libdrm >= 2.4.0" 2>/dev/null` | | | |
35 | else | | | |
36 | pkg_failed=yes | | | |
37 | fi | | | |
38 | @@ -22548,12 +22540,12 @@ if test -n "$PKG_CONFIG"; then | | | |
39 | pkg_cv_DRI_MM_LIBS="$DRI_MM_LIBS" | | | |
40 | else | | | |
41 | if test -n "$PKG_CONFIG" && \ | | | |
42 | - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.3.1\"") >&5 | | | |
43 | - ($PKG_CONFIG --exists --print-errors "libdrm >= 2.3.1") 2>&5 | | | |
44 | + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.4.0\"") >&5 | | | |
45 | + ($PKG_CONFIG --exists --print-errors "libdrm >= 2.4.0") 2>&5 | | | |
46 | ac_status=$? | | | |
47 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | | | |
48 | (exit $ac_status); }; then | | | |
49 | - pkg_cv_DRI_MM_LIBS=`$PKG_CONFIG --libs "libdrm >= 2.3.1" 2>/dev/null` | | | |
50 | + pkg_cv_DRI_MM_LIBS=`$PKG_CONFIG --libs "libdrm >= 2.4.0" 2>/dev/null` | | | |
51 | else | | | |
52 | pkg_failed=yes | | | |
53 | fi | | | |
54 | @@ -22572,9 +22564,9 @@ else | | | |
55 | _pkg_short_errors_supported=no | | | |
56 | fi | | | |
57 | if test $_pkg_short_errors_supported = yes; then | | | |
58 | - DRI_MM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdrm >= 2.3.1"` | | | |
59 | + DRI_MM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdrm >= 2.4.0"` | | | |
60 | else | | | |
61 | - DRI_MM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdrm >= 2.3.1"` | | | |
62 | + DRI_MM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdrm >= 2.4.0"` | | | |
63 | fi | | | |
64 | # Put the nasty error message in config.log where it belongs | | | |
65 | echo "$DRI_MM_PKG_ERRORS" >&5 | | | |