ftdi: update for latest libftdi 1.0.4
For libftd2xx1.0.4, which uses a different directory structure than libftd2xx0.4.16 Without this fix the build fails with version 1.0.4 of the driver. Note that this does not fix --with-ftd2xx-lib=shared Signed-off-by: Steve Bennett <steveb@workware.net.au> Signed-off-by: Spencer Oliver <ntfreak@users.sourceforge.net>
This commit is contained in:
parent
898dd3af46
commit
107ddb38b7
25
configure.in
25
configure.in
|
@ -873,14 +873,23 @@ if test $build_ft2232_ftd2xx = yes -o $build_presto_ftd2xx = yes ; then
|
||||||
AC_MSG_ERROR([Option: --with-ftd2xx-linux-tardir appears wrong, cannot find: ${FTD2XX_H}])
|
AC_MSG_ERROR([Option: --with-ftd2xx-linux-tardir appears wrong, cannot find: ${FTD2XX_H}])
|
||||||
fi
|
fi
|
||||||
CFLAGS="$CFLAGS -I$with_ftd2xx_linux_tardir"
|
CFLAGS="$CFLAGS -I$with_ftd2xx_linux_tardir"
|
||||||
FTD2XX_LDFLAGS="-L$with_ftd2xx_linux_tardir"
|
if test $with_ftd2xx_lib = shared; then
|
||||||
FTD2XX_LIB="-lftd2xx"
|
FTD2XX_LDFLAGS="-L$with_ftd2xx_linux_tardir"
|
||||||
if test $with_ftd2xx_lib != shared; then
|
FTD2XX_LIB="-lftd2xx"
|
||||||
# Test #1 - Future proof - if/when ftdichip fixes their distro.
|
else
|
||||||
# Try it with the simple ".a" suffix.
|
# Test #1 - v1.0.x
|
||||||
FTD2XX_LIB="$with_ftd2xx_linux_tardir/static_lib/libftd2xx.a"
|
case "$host_cpu" in
|
||||||
if test -f "${FTD2XX_LIB}"; then
|
i?86|x86_32)
|
||||||
FTD2XX_LDFLAGS="${FTD2XX_LDFLAGS}/static_lib"
|
dir=build/i386;;
|
||||||
|
amd64|x86_64)
|
||||||
|
dir=build/x86_64;;
|
||||||
|
*)
|
||||||
|
dir=none;;
|
||||||
|
esac
|
||||||
|
if test -f "$with_ftd2xx_linux_tardir/$dir/libftd2xx.a"; then
|
||||||
|
FTD2XX_LDFLAGS="-L$with_ftd2xx_linux_tardir/$dir"
|
||||||
|
# Also needs -lrt
|
||||||
|
FTD2XX_LIB="-lftd2xx -lrt"
|
||||||
else
|
else
|
||||||
# Test Number2.
|
# Test Number2.
|
||||||
# Grr.. perhaps it exists as a version number?
|
# Grr.. perhaps it exists as a version number?
|
||||||
|
|
Loading…
Reference in New Issue