diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
| commit | 4dc2822fa71e8e3d3ab004c8c14867607bb4de06 (patch) | |
| tree | 21e5b36849ea23f526cc58578a540de3882d7376 /package/xf86-video-intel/patches/patch-configure | |
| parent | 8f1eff09d5706cbea36ddf1bfc4661579f688853 (diff) | |
| parent | 38910b0bc0393c60da90e1b2540e3d4c5858dae9 (diff) | |
resolve merge conflict
Diffstat (limited to 'package/xf86-video-intel/patches/patch-configure')
| -rw-r--r-- | package/xf86-video-intel/patches/patch-configure | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/package/xf86-video-intel/patches/patch-configure b/package/xf86-video-intel/patches/patch-configure new file mode 100644 index 000000000..ac5f5031c --- /dev/null +++ b/package/xf86-video-intel/patches/patch-configure @@ -0,0 +1,42 @@ +--- xf86-video-intel-2.9.1.orig/configure 2009-10-26 12:53:35.000000000 +0100 ++++ xf86-video-intel-2.9.1/configure 2010-04-21 19:57:36.000000000 +0200 +@@ -12283,9 +12283,6 @@ if test x$DRI != xno; then + $as_echo_n "checking for ${sdkdir}/dri.h... " >&6; } + if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +-else +- test "$cross_compiling" = yes && +- as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + if test -r "${sdkdir}/dri.h"; then + eval "$as_ac_File=yes" + else +@@ -12307,9 +12304,6 @@ fi + $as_echo_n "checking for ${sdkdir}/sarea.h... " >&6; } + if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +-else +- test "$cross_compiling" = yes && +- as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + if test -r "${sdkdir}/sarea.h"; then + eval "$as_ac_File=yes" + else +@@ -12331,9 +12325,6 @@ fi + $as_echo_n "checking for ${sdkdir}/dristruct.h... " >&6; } + if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +-else +- test "$cross_compiling" = yes && +- as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + if test -r "${sdkdir}/dristruct.h"; then + eval "$as_ac_File=yes" + else +@@ -12927,9 +12918,6 @@ else + $as_echo_n "checking for $XORG_SGML_PATH/X11/defs.ent... " >&6; } + if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +-else +- test "$cross_compiling" = yes && +- as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + if test -r "$XORG_SGML_PATH/X11/defs.ent"; then + eval "$as_ac_File=yes" + else |