package/libftdi/0001_pkgconfig_libusb.patch

   1 ---
   2  configure.in |   35 +++++++++++------------------------
   3  1 file changed, 11 insertions(+), 24 deletions(-)
   4
   5 --- a/configure.in
   6 +++ b/configure.in
   7 @@ -8,30 +8,17 @@
   8  AM_PROG_LIBTOOL
   9  AC_PROG_CXX
  10
  11 -dnl check for libusb-config
  12 -AC_CHECK_TOOL(HAVELIBUSB, libusb-config)
  13 -
  14 -if test ! -z "$HAVELIBUSB"; then
  15 -   LIBUSB_CFLAGS=`$HAVELIBUSB --cflags`
  16 -   LIBUSB_LIBS=`$HAVELIBUSB --libs`
  17 -
  18 -   CFLAGS="$CFLAGS $LIBUSB_CFLAGS"
  19 -   LIBS="$LIBS $LIBUSB_LIBS"
  20 -else
  21 -   AC_MSG_ERROR([*** libusb-config not found. You need a working libusb installation.])
  22 -fi
  23 -
  24 -dnl check for version of libusb
  25 -AC_MSG_CHECKING([if libusb version is >= 0.1.7])
  26 -libusb_version_needed="1007"
  27 -libusb_version=`$HAVELIBUSB --version | sed -e "s/libusb //" | awk 'BEGIN { FS = "."; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'`
  28 +dnl check for libusb
  29 +PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.11)
  30 +CFLAGS="$CFLAGS $LIBUSB_CFLAGS"
  31 +LIBS="$LIBS $LIBUSB_LIBS"
  32
  33 -if test $libusb_version -lt $libusb_version_needed; then
  34 -   AC_MSG_RESULT(no)
  35 -   AC_MSG_ERROR([*** libusb is too old ($libusb_version). You need a libusb installation newer or equal to 0.1.7.])
  36 -else
  37 -   AC_MSG_RESULT(yes)
  38 -fi
  39 +dnl Check for recent pkg-config which supports Requires.private
  40 +case `$PKG_CONFIG --version` in
  41 +0.?|0.1[0-7]) PKGCONFIG_REQUIRES="Requires"; ;;
  42 +*) PKGCONFIG_REQUIRES="Requires.private"; ;;
  43 +esac
  44 +AC_SUBST(PKGCONFIG_REQUIRES)
  45
  46  ENABLE_ASYNC_MODE=0
  47  AC_ARG_WITH(async-mode,