Bug#470266: pciaccess check should use >= 0.10 instead of 0.10.0 - patch
tags 470266 patch
thanks
I've made a patch that fixes the version number in the configure and
the configure.ac file.
Package now builds correctly with pbuilder.
Bye,
Emilio
--- xserver-xorg-video-i810.orig/configure.ac 2008-03-14 14:09:35.000000000 +0100
+++ xserver-xorg-video-i810/configure.ac 2008-03-14 14:10:00.000000000 +0100
@@ -115,9 +115,9 @@
CFLAGS="$save_CFLAGS"
if test x$XSERVER_LIBPCIACCESS = xyes; then
- PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10.0])
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10])
else
- PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10.0],
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10],
have_libpciaccess=yes,
have_libpciaccess=no)
fi
--- xserver-xorg-video-i810.orig/configure 2008-03-14 14:42:51.000000000 +0100
+++ xserver-xorg-video-i810/configure 2008-03-14 14:50:05.000000000 +0100
@@ -21807,12 +21807,12 @@
pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess >= 0.10.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10.0") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess >= 0.10\"") >&5
+ ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_PCIACCESS_CFLAGS=`$PKG_CONFIG --cflags "pciaccess >= 0.10.0" 2>/dev/null`
+ pkg_cv_PCIACCESS_CFLAGS=`$PKG_CONFIG --cflags "pciaccess >= 0.10" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -21825,12 +21825,12 @@
pkg_cv_PCIACCESS_LIBS="$PCIACCESS_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess >= 0.10.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10.0") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess >= 0.10\"") >&5
+ ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_PCIACCESS_LIBS=`$PKG_CONFIG --libs "pciaccess >= 0.10.0" 2>/dev/null`
+ pkg_cv_PCIACCESS_LIBS=`$PKG_CONFIG --libs "pciaccess >= 0.10" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -21849,14 +21849,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pciaccess >= 0.10.0"`
+ PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pciaccess >= 0.10"`
else
- PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pciaccess >= 0.10.0"`
+ PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pciaccess >= 0.10"`
fi
# Put the nasty error message in config.log where it belongs
echo "$PCIACCESS_PKG_ERRORS" >&5
- { { echo "$as_me:$LINENO: error: Package requirements (pciaccess >= 0.10.0) were not met:
+ { { echo "$as_me:$LINENO: error: Package requirements (pciaccess >= 0.10) were not met:
$PCIACCESS_PKG_ERRORS
@@ -21867,7 +21867,7 @@
and PCIACCESS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
-echo "$as_me: error: Package requirements (pciaccess >= 0.10.0) were not met:
+echo "$as_me: error: Package requirements (pciaccess >= 0.10) were not met:
$PCIACCESS_PKG_ERRORS
@@ -21919,12 +21919,12 @@
pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess >= 0.10.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10.0") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess >= 0.10\"") >&5
+ ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_PCIACCESS_CFLAGS=`$PKG_CONFIG --cflags "pciaccess >= 0.10.0" 2>/dev/null`
+ pkg_cv_PCIACCESS_CFLAGS=`$PKG_CONFIG --cflags "pciaccess >= 0.10" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -21937,12 +21937,12 @@
pkg_cv_PCIACCESS_LIBS="$PCIACCESS_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess >= 0.10.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10.0") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess >= 0.10\"") >&5
+ ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_PCIACCESS_LIBS=`$PKG_CONFIG --libs "pciaccess >= 0.10.0" 2>/dev/null`
+ pkg_cv_PCIACCESS_LIBS=`$PKG_CONFIG --libs "pciaccess >= 0.10" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -21961,9 +21961,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pciaccess >= 0.10.0"`
+ PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pciaccess >= 0.10"`
else
- PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pciaccess >= 0.10.0"`
+ PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pciaccess >= 0.10"`
fi
# Put the nasty error message in config.log where it belongs
echo "$PCIACCESS_PKG_ERRORS" >&5
Reply to: