NDT-DEV email list created

Revision: 1034
Author:   

Date:     Mon Mar 24 08:50:46 2014 UTC
Log:      Merge issue125 branch into trunk
http://code.google.com/p/ndt/source/detail?r=1034

Modified:
 /trunk
 /trunk/configure.ac
 /trunk/src/Makefile.am

=======================================
--- /trunk/configure.ac Wed Feb 12 07:16:35 2014 UTC
+++ /trunk/configure.ac Mon Mar 24 08:50:46 2014 UTC
@@ -88,6 +88,16 @@
        AM_CONDITIONAL(BUILD_APPLET, false)
 fi

+# Enabling/disabling fakewww build
+AC_ARG_ENABLE(fakewww, [  --enable-fakewww=[yes/no] turn on fakewww build
+              [default=no]],, enable_fakewww=no_def)
+
+if test "x$enable_fakewww" != "xyes"; then
+       AM_CONDITIONAL(BUILD_FAKEWWW, false)
+else
+       AM_CONDITIONAL(BUILD_FAKEWWW, true)
+fi
+
 # Using certificate to sign java applet
 AC_ARG_WITH(cert,
                AC_HELP_STRING([--with-cert=<file>],
@@ -363,7 +373,13 @@
 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"
@@ -411,7 +427,7 @@
 echo "* flash-client: ${SUMMARY_FLASHCLT}"
 echo ""

-if test "$SUMMARY_FAKEWWW" = "YES" && (test "$SUMMARY_WEB100SRV" = "YES" | 
| test "$SUMMARY_WEB100GSRV" = "YES"); then
+if test "$SUMMARY_WEB100SRV" = "YES" || test "$SUMMARY_WEB100GSRV"  
= "YES"; then
 echo "*** Server Tools - complete"
 else
 echo "*** Server Tools - incomplete"
=======================================
--- /trunk/src/Makefile.am      Mon Oct 14 13:20:21 2013 UTC
+++ /trunk/src/Makefile.am      Mon Mar 24 08:50:46 2014 UTC
@@ -22,12 +22,16 @@

 ndtdir = $(prefix)/ndt

+if BUILD_FAKEWWW
+ADD_FAKEWWW = fakewww
+endif
+
 if HAVE_WEB100
 bin_PROGRAMS = web100clt analyze viewtrace tr-mkmap genplot
 if HAVE_PCAP_H
-sbin_PROGRAMS = fakewww web100srv
+sbin_PROGRAMS = $(ADD_FAKEWWW) web100srv
 else
-sbin_PROGRAMS = fakewww
+sbin_PROGRAMS = $(ADD_FAKEWWW)
 endif
 else
 bin_PROGRAMS = web100clt
@@ -38,7 +42,7 @@
 if HAVE_WEB100
 sbin_PROGRAMS += web10gsrv genplot10g
 else
-sbin_PROGRAMS = fakewww web10gsrv genplot10g
+sbin_PROGRAMS = $(ADD_FAKEWWW) web10gsrv genplot10g
 endif
 endif
 endif
@@ -62,10 +66,12 @@
 analyze_LDADD = $(NDTLIBS) $(I2UTILLIBDEPS) $(ZLIB)
 analyze_CPPFLAGS ='-DBASEDIR="$(ndtdir)"' -DFORCE_WEB100

+if BUILD_FAKEWWW
 fakewww_SOURCES = fakewww.c troute.c troute6.c tr-tree.c tr-tree6.c  
network.c usage.c logging.c \
                   runningtest.c ndtptestconstants.c strlutils.c
 fakewww_LDADD = $(I2UTILLIBDEPS) $(ZLIB)
 fakewww_CPPFLAGS ='-DBASEDIR="$(ndtdir)"'
+endif

 web100srv_SOURCES = web100srv.c web100-util.c web100-pcap.c web100-admin.c  
runningtest.c \
                     network.c usage.c utils.c mrange.c logging.c  
testoptions.c ndtptestconstants.c \