patch-configure 2.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990
  1. --- sane-backends-1.0.22.orig/configure 2011-02-14 02:27:52.000000000 +0100
  2. +++ sane-backends-1.0.22/configure 2011-10-01 19:32:51.919066675 +0200
  3. @@ -7529,77 +7529,7 @@ done
  4. -
  5. -
  6. -
  7. -pkg_failed=no
  8. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBV4L" >&5
  9. -$as_echo_n "checking for LIBV4L... " >&6; }
  10. -
  11. -if test -n "$LIBV4L_CFLAGS"; then
  12. - pkg_cv_LIBV4L_CFLAGS="$LIBV4L_CFLAGS"
  13. - elif test -n "$PKG_CONFIG"; then
  14. - if test -n "$PKG_CONFIG" && \
  15. - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libv4l1\""; } >&5
  16. - ($PKG_CONFIG --exists --print-errors "libv4l1") 2>&5
  17. - ac_status=$?
  18. - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  19. - test $ac_status = 0; }; then
  20. - pkg_cv_LIBV4L_CFLAGS=`$PKG_CONFIG --cflags "libv4l1" 2>/dev/null`
  21. -else
  22. - pkg_failed=yes
  23. -fi
  24. - else
  25. - pkg_failed=untried
  26. -fi
  27. -if test -n "$LIBV4L_LIBS"; then
  28. - pkg_cv_LIBV4L_LIBS="$LIBV4L_LIBS"
  29. - elif test -n "$PKG_CONFIG"; then
  30. - if test -n "$PKG_CONFIG" && \
  31. - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libv4l1\""; } >&5
  32. - ($PKG_CONFIG --exists --print-errors "libv4l1") 2>&5
  33. - ac_status=$?
  34. - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  35. - test $ac_status = 0; }; then
  36. - pkg_cv_LIBV4L_LIBS=`$PKG_CONFIG --libs "libv4l1" 2>/dev/null`
  37. -else
  38. - pkg_failed=yes
  39. -fi
  40. - else
  41. - pkg_failed=untried
  42. -fi
  43. -
  44. -
  45. -
  46. -if test $pkg_failed = yes; then
  47. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  48. -$as_echo "no" >&6; }
  49. -
  50. -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
  51. - _pkg_short_errors_supported=yes
  52. -else
  53. - _pkg_short_errors_supported=no
  54. -fi
  55. - if test $_pkg_short_errors_supported = yes; then
  56. - LIBV4L_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libv4l1" 2>&1`
  57. - else
  58. - LIBV4L_PKG_ERRORS=`$PKG_CONFIG --print-errors "libv4l1" 2>&1`
  59. - fi
  60. - # Put the nasty error message in config.log where it belongs
  61. - echo "$LIBV4L_PKG_ERRORS" >&5
  62. -
  63. - have_libv4l1=no
  64. -elif test $pkg_failed = untried; then
  65. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  66. -$as_echo "no" >&6; }
  67. - have_libv4l1=no
  68. -else
  69. - LIBV4L_CFLAGS=$pkg_cv_LIBV4L_CFLAGS
  70. - LIBV4L_LIBS=$pkg_cv_LIBV4L_LIBS
  71. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  72. -$as_echo "yes" >&6; }
  73. - have_libv4l1=yes
  74. -fi
  75. +have_libv4l1=no
  76. @@ -16874,7 +16804,7 @@ ALL_BACKENDS="abaton agfafocus apple art
  77. leo lexmark ma1509 magicolor \
  78. matsushita microtek microtek2 mustek mustek_pp \
  79. mustek_usb mustek_usb2 nec net niash pie pint \
  80. - pixma plustek plustek_pp qcam ricoh rts8891 s9036 \
  81. + pixma plustek plustek_pp ricoh rts8891 s9036 \
  82. sceptre sharp sm3600 sm3840 snapscan sp15c st400 \
  83. stv680 tamarack teco1 teco2 teco3 test u12 umax
  84. umax_pp umax1220u v4l xerox_mfp p5"