diff options
| author | Steve Bennett <steveb@workware.net.au> | 2011-07-12 12:34:27 +0100 |
|---|---|---|
| committer | Spencer Oliver <ntfreak@users.sourceforge.net> | 2011-07-12 12:35:28 +0100 |
| commit | 107ddb38b7450f46bd812f52208e43c073e71af6 (patch) | |
| tree | 70f0e33ee1b5fd5c59716e5ade931b8e4fc785b9 | |
| parent | 898dd3af46e76fb195c6894f54e9bc9272375ffb (diff) | |
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>
| -rw-r--r-- | configure.in | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/configure.in b/configure.in index de74ffa9..8c77a255 100644 --- a/configure.in +++ b/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}]) fi CFLAGS="$CFLAGS -I$with_ftd2xx_linux_tardir" - FTD2XX_LDFLAGS="-L$with_ftd2xx_linux_tardir" - FTD2XX_LIB="-lftd2xx" - if test $with_ftd2xx_lib != shared; then - # Test #1 - Future proof - if/when ftdichip fixes their distro. - # Try it with the simple ".a" suffix. - FTD2XX_LIB="$with_ftd2xx_linux_tardir/static_lib/libftd2xx.a" - if test -f "${FTD2XX_LIB}"; then - FTD2XX_LDFLAGS="${FTD2XX_LDFLAGS}/static_lib" + if test $with_ftd2xx_lib = shared; then + FTD2XX_LDFLAGS="-L$with_ftd2xx_linux_tardir" + FTD2XX_LIB="-lftd2xx" + else + # Test #1 - v1.0.x + case "$host_cpu" in + i?86|x86_32) + 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 # Test Number2. # Grr.. perhaps it exists as a version number? |