Changeset a1e177d


Ignore:
Timestamp:
08/03/10 16:41:07 (10 years ago)
Author:
Shane Alcock <salcock@…>
Branches:
4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes
Children:
9f1b6ee
Parents:
11754a6
Message:
  • Don't build tracetop if libncurses isn't available, rather than making the entirety of libtrace dependent on libncurses
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • configure.in

    r11754a6 ra1e177d  
    340340DAG_VERSION_NUM=$dag_drv_v
    341341
     342have_ncurses=yes
    342343
    343344AC_CHECK_LIB(z, deflate)
     
    345346AC_CHECK_LIB(lzo2, lzo1x_1_compress)
    346347AC_CHECK_LIB(pthread, pthread_create)
    347 AC_SEARCH_LIBS(mvprintw, ncurses, [], [ AC_MSG_ERROR([NCurses library not available]) ])
     348AC_SEARCH_LIBS(mvprintw, ncurses, , have_ncurses=no)
    348349AC_SEARCH_LIBS(getservent, socket, [], [], -lnsl)               
    349350AC_SEARCH_LIBS(inet_ntop, nsl, [], [], -lsocket)
     
    404405AM_CONDITIONAL([HAVE_LIBGDC], [test "$ac_cv_header_gdc_h" = yes])
    405406AM_CONDITIONAL([HAVE_LLVM], [test "x$JIT" != "xno" ])
     407AM_CONDITIONAL([HAVE_NCURSES], [test "x$have_ncurses" = "xyes"])
    406408
    407409# Check for miscellaneous programs
     
    423425AC_SUBST([HAVE_LIBGDC])
    424426AC_SUBST([HAVE_LLVM])
     427AC_SUBST([HAVE_NCURSES])
    425428AC_SUBST([LIBCFLAGS])
    426429AC_SUBST([LIBCXXFLAGS])
     
    455458reportopt "Compiled with LLVM BPF JIT support" $JIT
    456459reportopt "Building man pages/documentation" $libtrace_doxygen
     460reportopt "Building tracetop (requires libncurses)" $have_ncurses
    457461
    458462echo
  • tools/tracetop/Makefile.am

    r7ab7320 ra1e177d  
     1if HAVE_NCURSES
    12bin_PROGRAMS = tracetop
    23man_MANS = tracetop.1
     
    45
    56include ../Makefile.tools
     7
    68tracetop_SOURCES = tracetop.cc
    79tracetop_LDADD = -lncurses
    810tracetop_CPPFLAGS = -fno-strict-aliasing $(AM_CFLAGS)
     11endif
Note: See TracChangeset for help on using the changeset viewer.