Changeset 12064


Ignore:
Timestamp:
Mar 2, 2011, 7:31:14 AM (11 years ago)
Author:
jordan
Message:

(trunk) #4041 "FTBFS with enabled uTP on Debian" -- revised patch from taem which unbreaks autoconf build on darwin as reported by leena

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r12040 r12064  
    196196
    197197
    198 dnl libevent likes to link against librt if possible
    199 dnl for clock_gettime() and clock_settime()
    200 dnl TODO(libevent2): this can probably be removed after
    201 dnl we switch to libevent2, since it will have PKG_CONFIG
    202 AC_CHECK_LIB([rt],
    203              [clock_gettime],
    204              [libevent_extra_libs="-lrt"],
    205              [libevent_extra_libs=""])
    206 
    207 
    208198dnl ----------------------------------------------------------------------------
    209199dnl
     
    219209dnl
    220210dnl  utp
     211
     212AC_CHECK_LIB([rt],
     213             [clock_gettime],
     214             [libutp_extra_libs="-lrt"],
     215             [libutp_extra_libs=""])
    221216
    222217AC_MSG_CHECKING([µTP])
     
    234229    if test "x$have_utp" = "xyes"; then
    235230        LIBUTP_CFLAGS="-I\$(top_srcdir)/third-party/"
    236         LIBUTP_LIBS="\$(top_builddir)/third-party/libutp/libutp.a -lrt"
     231        LIBUTP_LIBS="\$(top_builddir)/third-party/libutp/libutp.a"
     232        if test "x$libutp_extra_libs" != "x" ; then
     233           LIBUTP_LIBS="$LIBUTP_LIBS $libutp_extra_libs"
     234        fi
    237235        AC_DEFINE([WITH_UTP],[1])
    238236        build_utp="yes"
Note: See TracChangeset for help on using the changeset viewer.