Skip to Content.
Sympa Menu

ndt-dev - [ndt-dev] [ndt] r1152 committed - Merged with latest trunk

Subject: NDT-DEV email list created

List archive

[ndt-dev] [ndt] r1152 committed - Merged with latest trunk


Chronological Thread 
  • From:
  • To:
  • Subject: [ndt-dev] [ndt] r1152 committed - Merged with latest trunk
  • Date: Wed, 12 Nov 2014 12:59:39 +0000

Revision: 1152
Author:

Date: Wed Nov 12 12:59:22 2014 UTC
Log: Merged with latest trunk
https://code.google.com/p/ndt/source/detail?r=1152

Modified:
/branches/Issue162
/branches/Issue162/configure.ac
/branches/Issue162/src/Makefile.am

=======================================
--- /branches/Issue162/configure.ac Fri Nov 7 08:49:50 2014 UTC
+++ /branches/Issue162/configure.ac Wed Nov 12 12:59:22 2014 UTC
@@ -258,15 +258,16 @@
AM_CONDITIONAL(HAVE_PCAP_H, false)
fi

-AC_CHECK_HEADER(jansson.h, [] [b=0])
-if test $b == 0
-then
- JSONLIB="-ljansson"
- AC_DEFINE(HAVE_JANSSON_H, 1, [Have JANSSON header file.])
- AM_CONDITIONAL(HAVE_JANSSON_H, true)
-else
- AM_CONDITIONAL(HAVE_JANSSON_H, false)
-fi
+AC_CHECK_LIB([jansson], [json_true],
+ [
+ JSONLIB="-ljansson"
+ AC_DEFINE(HAVE_JANSSON, 1, [Define to 1 if you have the 'jansson' library (-ljansson).])
+ AM_CONDITIONAL(HAVE_JANSSON, true)
+ ],
+ [
+ JSONLIB=""
+ AM_CONDITIONAL(HAVE_JANSSON, false)
+ ])

AC_CHECK_LIB([z], [deflateInit_],
[
@@ -391,12 +392,12 @@

if test -z "$HAVE_WEB10G_TRUE" && test -n "$HAVE_WEB10G_FALSE"; then
if test -z "$HAVE_PCAP_H_TRUE" && test -n "$HAVE_PCAP_H_FALSE"; then
-if test -z "$HAVE_JANSSON_H_TRUE" && test -n "$HAVE_JANSSON_H_FALSE"; then
+if test -z "$HAVE_JANSSON_TRUE" && test -n "$HAVE_JANSSON_FALSE"; then
SUMMARY_WEB10GSRV="YES"
SUMMARY_GENPLOT10G="YES"
else
SUMMARY_GENPLOT10G="YES"
- SUMMARY_WEB10GSRV="NO (missing jansson headers)"
+ SUMMARY_WEB10GSRV="NO (missing jansson library)"
fi
else
SUMMARY_GENPLOT10G="YES"
@@ -407,36 +408,36 @@
SUMMARY_GENPLOT10G="NO (missing web10g userland library >=2.0.6.2)"
fi

-if test -z "$HAVE_JANSSON_H_TRUE" && test -n "$HAVE_JANSSON_H_FALSE"; then
+if test -z "$HAVE_JANSSON_TRUE" && test -n "$HAVE_JANSSON_FALSE"; then
SUMMARY_WEB100CLT="YES"
else
- SUMMARY_WEB100CLT="NO (missing jansson headers)"
+ SUMMARY_WEB100CLT="NO (missing jansson library)"
+fi
+
+if test "x$enable_fakewww" == "xno"; then
+SUMMARY_FAKEWWW="NO (disabled by user)"
+elif test "x$enable_fakewww" != "xyes"; then
+SUMMARY_FAKEWWW="NO (disabled by default)"
+else
+SUMMARY_FAKEWWW="YES"
fi

if test -z "$HAVE_WEB100_TRUE" && test -n "$HAVE_WEB100_FALSE"; then
if test -z "$HAVE_PCAP_H_TRUE" && test -n "$HAVE_PCAP_H_FALSE"; then
-if test -z "$HAVE_JANSSON_H_TRUE" && test -n "$HAVE_JANSSON_H_FALSE"; then
+if test -z "$HAVE_JANSSON_TRUE" && test -n "$HAVE_JANSSON_FALSE"; then
SUMMARY_WEB100SRV="YES"
else
-SUMMARY_WEB100SRV="NO (missing jansson headers)"
+SUMMARY_WEB100SRV="NO (missing jansson library)"
fi
else
SUMMARY_WEB100SRV="NO (missing pcap headers)"
fi
-if test "x$enable_fakewww" == "xno"; then
-SUMMARY_FAKEWWW="NO (disabled by user)"
-elif test "x$enable_fakewww" != "xyes"; then
-SUMMARY_FAKEWWW="NO (disabled by default)"
-else
-SUMMARY_FAKEWWW="YES"
-fi
SUMMARY_ANALYZE="YES"
SUMMARY_VIEWTRACE="YES"
SUMMARY_TRMKMAP="YES"
SUMMARY_GENPLOT="YES"
else
SUMMARY_WEB100SRV="NO (missing web100 library)"
-SUMMARY_FAKEWWW="NO (missing web100 library)"
SUMMARY_ANALYZE="NO (missing web100 library)"
SUMMARY_VIEWTRACE="NO (missing web100 library)"
SUMMARY_TRMKMAP="NO (missing web100 library)"
=======================================
--- /branches/Issue162/src/Makefile.am Fri Jun 20 14:26:21 2014 UTC
+++ /branches/Issue162/src/Makefile.am Wed Nov 12 12:59:22 2014 UTC
@@ -26,23 +26,26 @@
ADD_FAKEWWW = fakewww
endif

+bin_PROGRAMS =
+sbin_PROGRAMS = $(ADD_FAKEWWW)
+
if HAVE_WEB100
-bin_PROGRAMS = web100clt analyze viewtrace tr-mkmap genplot
+bin_PROGRAMS += analyze viewtrace tr-mkmap genplot
+if HAVE_JANSSON
+bin_PROGRAMS += web100clt
+endif
if HAVE_PCAP_H
-sbin_PROGRAMS = $(ADD_FAKEWWW) web100srv
-else
-sbin_PROGRAMS = $(ADD_FAKEWWW)
+if HAVE_JANSSON
+sbin_PROGRAMS += web100srv
+endif
endif
-else
-bin_PROGRAMS = web100clt
endif

if HAVE_WEB10G
+bin_PROGRAMS += genplot10g
if HAVE_PCAP_H
-if HAVE_WEB100
-sbin_PROGRAMS += web10gsrv genplot10g
-else
-sbin_PROGRAMS = $(ADD_FAKEWWW) web10gsrv genplot10g
+if HAVE_JANSSON
+sbin_PROGRAMS += web10gsrv
endif
endif
endif


  • [ndt-dev] [ndt] r1152 committed - Merged with latest trunk, ndt, 11/12/2014

Archive powered by MHonArc 2.6.16.

Top of Page