[openocd-svn] Main OpenOCD repository branch, master, updated. v0.3.0-161-g26849ad

[David B. <dbr...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  26849ad60d269b0e8d254882bc75268a393dd2a1 (commit)
      from  de735d375b979377e124dc2daf1a5f473de19d81 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 26849ad60d269b0e8d254882bc75268a393dd2a1
Author: Liam Redmond <in...@ro...>
Date:   Thu Nov 12 12:50:41 2009 -0800

    WinXP-x64: find right D2XX libraries
    
    This trivial patch allows the config script to find the correct
    FTDI2xx libraries under Windows XP x64 using msys.
    
    Signed-off-by: David Brownell <dbr...@us...>

diff --git a/configure.in b/configure.in
index d7f8d47..fa2a498 100644
--- a/configure.in
+++ b/configure.in
@@ -736,12 +736,12 @@ if test $build_ft2232_ftd2xx = yes -o $build_presto_ftd2xx = yes ; then
 
     # And calculate the LDFLAGS for the machine
     case "$host_cpu" in
-    i?86|x86_*)
+    i?86|x86_32)
       LDFLAGS="$LDFLAGS -L$with_ftd2xx_win32_zipdir/i386"
       LIBS="$LIBS -lftd2xx"
       f=$with_ftd2xx_win32_zipdir/i386/ftd2xx.lib
       ;;
-    amd64)
+    amd64|x86_64)
       LDFLAGS="$LDFLAGS -L$with_ftd2xx_win32_zipdir/amd64"
       LIBS="$LIBS -lftd2xx"
       f=$with_ftd2xx_win32_zipdir/amd64/ftd2xx.lib

-----------------------------------------------------------------------

Summary of changes:
 configure.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository