Changeset a1e177d

Timestamp:

08/03/10 16:41:07 (11 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:

• configure.in (modified) (5 diffs)
• tools/tracetop/Makefile.am (modified) (2 diffs)

configure.in

@@ -340 +340 @@
 DAG_VERSION_NUM=$dag_drv_v
 
+have_ncurses=yes
 
 AC_CHECK_LIB(z, deflate)
@@ -345 +346 @@
 AC_CHECK_LIB(lzo2, lzo1x_1_compress)
 AC_CHECK_LIB(pthread, pthread_create)
-AC_SEARCH_LIBS(mvprintw, ncurses, [], [ AC_MSG_ERROR([NCurses library not available]) ])
+AC_SEARCH_LIBS(mvprintw, ncurses, , have_ncurses=no)
 AC_SEARCH_LIBS(getservent, socket, [], [], -lnsl)               
 AC_SEARCH_LIBS(inet_ntop, nsl, [], [], -lsocket)
@@ -404 +405 @@
 AM_CONDITIONAL([HAVE_LIBGDC], [test "$ac_cv_header_gdc_h" = yes])
 AM_CONDITIONAL([HAVE_LLVM], [test "x$JIT" != "xno" ])
+AM_CONDITIONAL([HAVE_NCURSES], [test "x$have_ncurses" = "xyes"])
 
 # Check for miscellaneous programs
@@ -423 +425 @@
 AC_SUBST([HAVE_LIBGDC])
 AC_SUBST([HAVE_LLVM])
+AC_SUBST([HAVE_NCURSES])
 AC_SUBST([LIBCFLAGS])
 AC_SUBST([LIBCXXFLAGS])
@@ -455 +458 @@
 reportopt "Compiled with LLVM BPF JIT support" $JIT
 reportopt "Building man pages/documentation" $libtrace_doxygen
+reportopt "Building tracetop (requires libncurses)" $have_ncurses
 
 echo 

tools/tracetop/Makefile.am

@@ +1 @@
+if HAVE_NCURSES
 bin_PROGRAMS = tracetop
 man_MANS = tracetop.1
@@ -4 +5 @@
 
 include ../Makefile.tools
+
 tracetop_SOURCES = tracetop.cc
 tracetop_LDADD = -lncurses 
 tracetop_CPPFLAGS = -fno-strict-aliasing $(AM_CFLAGS)
+endif