diff options
| author | Owain Ainsworth <oga@cvs.openbsd.org> | 2008-08-26 14:24:17 +0000 |
|---|---|---|
| committer | Owain Ainsworth <oga@cvs.openbsd.org> | 2008-08-26 14:24:17 +0000 |
| commit | 5507281eefafd76a17957256f9c2af914da79738 (patch) | |
| tree | f468cac207699630e309436d89ad284cef2e7f74 /driver/xf86-video-intel | |
| parent | 4a9357e4c79b536dd32c5c4a82e220fcb9505d1b (diff) | |
Don't try and build the memory manager parts for libdrm 2.3.1, this version has
been bumped to 2.4.0 upstream.
ok matthieu@
Diffstat (limited to 'driver/xf86-video-intel')
| -rw-r--r-- | driver/xf86-video-intel/configure | 16 | ||||
| -rw-r--r-- | driver/xf86-video-intel/configure.ac | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/driver/xf86-video-intel/configure b/driver/xf86-video-intel/configure index 2d57c2cb3..ffe08fa21 100644 --- a/driver/xf86-video-intel/configure +++ b/driver/xf86-video-intel/configure @@ -21791,12 +21791,12 @@ if test -n "$PKG_CONFIG"; then pkg_cv_DRI_MM_CFLAGS="$DRI_MM_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.3.1\"") >&5 - ($PKG_CONFIG --exists --print-errors "libdrm >= 2.3.1") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.4.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "libdrm >= 2.4.0") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_DRI_MM_CFLAGS=`$PKG_CONFIG --cflags "libdrm >= 2.3.1" 2>/dev/null` + pkg_cv_DRI_MM_CFLAGS=`$PKG_CONFIG --cflags "libdrm >= 2.4.0" 2>/dev/null` else pkg_failed=yes fi @@ -21809,12 +21809,12 @@ if test -n "$PKG_CONFIG"; then pkg_cv_DRI_MM_LIBS="$DRI_MM_LIBS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.3.1\"") >&5 - ($PKG_CONFIG --exists --print-errors "libdrm >= 2.3.1") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.4.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "libdrm >= 2.4.0") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_DRI_MM_LIBS=`$PKG_CONFIG --libs "libdrm >= 2.3.1" 2>/dev/null` + pkg_cv_DRI_MM_LIBS=`$PKG_CONFIG --libs "libdrm >= 2.4.0" 2>/dev/null` else pkg_failed=yes fi @@ -21833,9 +21833,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DRI_MM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdrm >= 2.3.1"` + DRI_MM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdrm >= 2.4.0"` else - DRI_MM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdrm >= 2.3.1"` + DRI_MM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdrm >= 2.4.0"` fi # Put the nasty error message in config.log where it belongs echo "$DRI_MM_PKG_ERRORS" >&5 diff --git a/driver/xf86-video-intel/configure.ac b/driver/xf86-video-intel/configure.ac index af589de1b..796b829f4 100644 --- a/driver/xf86-video-intel/configure.ac +++ b/driver/xf86-video-intel/configure.ac @@ -200,7 +200,7 @@ if test "$DRI" = yes; then PKG_CHECK_MODULES(DRI, [libdrm xf86driproto glproto]) AC_DEFINE(XF86DRI,1,[Enable DRI driver support]) AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support]) - PKG_CHECK_MODULES(DRI_MM, [libdrm >= 2.3.1],[DRI_MM=yes], [DRI_MM=no]) + PKG_CHECK_MODULES(DRI_MM, [libdrm >= 2.4.0],[DRI_MM=yes], [DRI_MM=no]) if test "x$DRI_MM" = xyes; then AC_DEFINE(XF86DRI_MM,1,[Extended DRI memory management]) fi |