Changeset 11754a6


Ignore:
Timestamp:
08/03/10 14:42:20 (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:
a1e177d
Parents:
7876f38
Message:
  • Added check for libnsl if needed for inet_ntop
  • Added check for ncurses.h being inside /usr/include/ncurses/ncurses.h - as it seems to be in a default OpenSolaris? install
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • configure.in

    r7876f38 r11754a6  
    1515if test -d "/usr/gnu/lib"; then
    1616        LDFLAGS+=" -L/usr/gnu/lib"
    17         CPPFLAGS+=" -I/usr/gnu/include"
    1817fi
    1918
     
    132131AC_HEADER_STDC
    133132AC_CHECK_HEADERS(pcap.h pcap-int.h pcap-bpf.h net/bpf.h sys/limits.h stddef.h inttypes.h limits.h net/ethernet.h sys/prctl.h)
     133
     134AC_CHECK_HEADERS(ncurses.h,,[missing_ncurses=true])
     135
     136if test "x$missing_ncurses" = xtrue; then
     137        if test -f "/usr/include/ncurses/ncurses.h"; then
     138                AC_DEFINE(HAVE_NCURSES_NCURSES_H,1,[Has nested ncurses header])
     139        fi
     140fi
     141
    134142
    135143AC_CHECK_HEADERS(netinet/in.h)
     
    339347AC_SEARCH_LIBS(mvprintw, ncurses, [], [ AC_MSG_ERROR([NCurses library not available]) ])
    340348AC_SEARCH_LIBS(getservent, socket, [], [], -lnsl)               
     349AC_SEARCH_LIBS(inet_ntop, nsl, [], [], -lsocket)
    341350
    342351
  • tools/tracetop/tracetop.cc

    r7876f38 r11754a6  
    1111#include <queue>
    1212#include <inttypes.h>
    13 #include <ncurses.h>
    1413#include <sys/socket.h>
    1514#include <netdb.h>
     
    1817#include <netpacket/packet.h>
    1918#include <net/ethernet.h>
     19#endif
     20
     21#if HAVE_NCURSES_NCURSES_H
     22#include <ncurses/ncurses.h>
     23#else
     24#include <ncurses.h>
    2025#endif
    2126
Note: See TracChangeset for help on using the changeset viewer.