Re: [sigrok-devel] [PATCH] detect version 1.x of libftdi library

[Dan H. <da...@da...>]

On Sun, 15 Jun 2014 11:08:37 +0200
Dan Horák <da...@da...> wrote:

> The FDTI library changed version, module name and also soname, so add
> an option to detect it when the 0.x version is not found. The 1.x API
> is compatible enough for libsigrok to build.

refreshed for current master, btw Fedora 21 will ship with libftdi 1.1


		Dan

> ---
>  configure.ac | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index d0654f1..5104629 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -406,7 +406,11 @@ if test "x$enable_libftdi" != "xno"; then
>  		[have_libftdi="yes"; LIB_CFLAGS="$LIB_CFLAGS
> $libftdi_CFLAGS"; LIBS="$LIBS $libftdi_LIBS";
>  		SR_PKGLIBS="$SR_PKGLIBS libftdi"],
> -		[have_libftdi="no"])
> +		[PKG_CHECK_MODULES([libftdi1], [libftdi1 >= 1.1],
> +			[LIB_CFLAGS="$LIB_CFLAGS $libftdi1_CFLAGS";
> +			LIBS="$LIBS $libftdi1_LIBS";
> +			SR_PKGLIBS="$SR_PKGLIBS libftdi1"],
> +			[have_libftdi="no"])])
>  	if test "x$enable_libftdi$have_libftdi" = "xyesno"; then
>  		AC_MSG_ERROR([libftdi support requested, but it was
> not found]) fi
> @@ -649,7 +653,7 @@ echo "Detected libraries:"
>  echo
>  
>  # Note: This only works for libs with pkg-config integration.
> -for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >=
> 0.1.0" "librevisa >= 0.0.20130812" "libusb-1.0 >= 1.0.16" "libftdi >=
> 0.16" "check >= 0.9.4"; do +for lib in "glib-2.0 >= 2.32.0" "libzip
> >= 0.10" "libserialport >= 0.1.0" "librevisa >= 0.0.20130812"
> >"libusb-1.0 >= 1.0.16" "libftdi >= 0.16" "libftdi1 >= 1.1" "check >=
> >0.9.4"; do optional="OPTIONAL" if test "x$lib" = "xglib-2.0 >=
> >2.32.0"; then optional="REQUIRED"; fi
>  	if test "x$lib" = "xlibzip >= 0.10"; then
> optional="REQUIRED"; fi
> -- 
> 1.9.3
> 
> 
> ------------------------------------------------------------------------------
> HPCC Systems Open Source Big Data Platform from LexisNexis Risk
> Solutions Find What Matters Most in Your Big Data with HPCC Systems
> Open Source. Fast. Scalable. Simple. Ideal for Dirty Data.
> Leverages Graph Analysis for Fast Processing & Easy Data Exploration
> http://p.sf.net/sfu/hpccsystems
> _______________________________________________
> sigrok-devel mailing list
> sig...@li...
> https://lists.sourceforge.net/lists/listinfo/sigrok-devel