[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.7.0-174-gc5787d9

[OpenOCD-Gerrit <ope...@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  c5787d94884be67a61d738c08160e08451e78752 (commit)
      from  c98856b62a4fd5eca05d1d1f1185300fdee13f39 (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 c5787d94884be67a61d738c08160e08451e78752
Author: Stephan Linz <li...@li...>
Date:   Fri Sep 6 15:03:54 2013 +0200

    configure: expand library search for libftd2xx
    
    Error was:
    checking for library containing FT_GetLibraryVersion... no
    configure: error: You appear to be missing the FTD2xx driver library.
    
    Reason were two cases:
    
    Case one:
    The FTD2xx library uses clock_gettime() and in normal cases
    the linker will find the function in the libc library. Most
    (older) systems require the program be linked with the librt
    library to use these (see man clock_gettime: Link with -lrt).
    
    Case two:
    You can rebuild the FTD2xx library (relink from the object
    files) against the primary (system wide installed) libusb-1.0.
    So you avoid mixed code (GPL with proprietary code) in the
    FTD2xx library. In this case, the FTD2xx library provides no
    private (linked in) libusb-1.0 functionality and require the
    program be linked with the libftd2xx __AND__ the libusb-1.0
    to resolve all the libusb-1.0 symbols.
    
    Change-Id: Iaf9a35ab4257e37b98dccd47667378ad2a64b7ed
    Signed-off-by: Stephan Linz <li...@li...>
    Reviewed-on: http://openocd.zylin.com/1614
    Tested-by: jenkins
    Reviewed-by: Andreas Fritiofson <and...@gm...>
    Reviewed-by: Xiaofan <xia...@gm...>

diff --git a/configure.ac b/configure.ac
index 9d5c0a1..038212c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -908,7 +908,7 @@ if test $build_ft2232_ftd2xx = yes -o $build_presto_ftd2xx = yes -o $build_usb_b
       ])
     AC_SEARCH_LIBS([FT_GetLibraryVersion],[ftd2xx],,[
         AC_MSG_ERROR([You appear to be missing the FTD2xx driver library.])
-      ],[])
+      ],[-lrt -lusb-1.0])
   fi
 fi
 fi # linux

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

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


hooks/post-receive
-- 
Main OpenOCD repository