patch-configure 2.2 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273
  1. $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  2. --- openobex-1.5.orig/configure 2009-02-08 19:32:25.000000000 +0100
  3. +++ openobex-1.5/configure 2009-06-04 21:43:21.000000000 +0200
  4. @@ -10943,7 +10943,7 @@ $as_echo "no" >&6; }
  5. fi
  6. case $host in
  7. - *-*-linux*)
  8. + *)
  9. pkg_failed=no
  10. @@ -11270,60 +11270,6 @@ fi
  11. -if test $pkg_failed = yes; then
  12. -
  13. -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
  14. - _pkg_short_errors_supported=yes
  15. -else
  16. - _pkg_short_errors_supported=no
  17. -fi
  18. - if test $_pkg_short_errors_supported = yes; then
  19. - USB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libusb" 2>&1`
  20. - else
  21. - USB_PKG_ERRORS=`$PKG_CONFIG --print-errors "libusb" 2>&1`
  22. - fi
  23. - # Put the nasty error message in config.log where it belongs
  24. - echo "$USB_PKG_ERRORS" >&5
  25. -
  26. - { $as_echo "$as_me:$LINENO: result: no" >&5
  27. -$as_echo "no" >&6; }
  28. - { $as_echo "$as_me:$LINENO: result: no" >&5
  29. -$as_echo "no" >&6; }
  30. -elif test $pkg_failed = untried; then
  31. - { $as_echo "$as_me:$LINENO: result: no" >&5
  32. -$as_echo "no" >&6; }
  33. -else
  34. - USB_CFLAGS=$pkg_cv_USB_CFLAGS
  35. - USB_LIBS=$pkg_cv_USB_LIBS
  36. - { $as_echo "$as_me:$LINENO: result: yes" >&5
  37. -$as_echo "yes" >&6; }
  38. - usb_lib_found=yes
  39. -fi
  40. - as_ac_File=`$as_echo "ac_cv_file_${prefix}/lib/pkgconfig/libusb.pc" | $as_tr_sh`
  41. -{ $as_echo "$as_me:$LINENO: checking for ${prefix}/lib/pkgconfig/libusb.pc" >&5
  42. -$as_echo_n "checking for ${prefix}/lib/pkgconfig/libusb.pc... " >&6; }
  43. -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
  44. - $as_echo_n "(cached) " >&6
  45. -else
  46. - test "$cross_compiling" = yes &&
  47. - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
  48. -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
  49. - { (exit 1); exit 1; }; }
  50. -if test -r "${prefix}/lib/pkgconfig/libusb.pc"; then
  51. - eval "$as_ac_File=yes"
  52. -else
  53. - eval "$as_ac_File=no"
  54. -fi
  55. -fi
  56. -ac_res=`eval 'as_val=${'$as_ac_File'}
  57. - $as_echo "$as_val"'`
  58. - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  59. -$as_echo "$ac_res" >&6; }
  60. -as_val=`eval 'as_val=${'$as_ac_File'}
  61. - $as_echo "$as_val"'`
  62. - if test "x$as_val" = x""yes; then
  63. - REQUIRES="libusb"
  64. -fi
  65. ;;
  66. esac