Changeset 4a605a9

Timestamp:

11/02/05 11:53:44 (16 years ago)

Author:

Daniel Lawson <dlawson@…>

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:

5261dbd

Parents:

8bfa671

Message:

added --disable-libpacketdump and --disable-tools configure options.

tools/tracedump will only get built if libpacketdump is also being built
libpacketdump will fail to build (and generate an error) if there is no c++ compiler installed.

Files:

• Makefile.am (modified) (1 diff)
• configure.in (modified) (5 diffs)
• libpacketdump/Makefile.am (modified) (2 diffs)
• tools/Makefile.am (modified) (1 diff)

Makefile.am

@@ -1 @@
-SUBDIRS=lib docs libpacketdump tools
+if LIBPACKETDUMP
+LIBPACKETDUMP_DIR = libpacketdump
+endif
+if LIBTRACE_TOOLS
+TOOLS_DIR = tools
+endif
+SUBDIRS = lib docs $(LIBPACKETDUMP_DIR) $(TOOLS_DIR)
 
 AUTOMAKE_OPTIONS = 1.5

configure.in

@@ -145 +145 @@
              fi
 )
+
+# configure time option for building libpacketdump
+# libpacketdump needs a C++ compiler to build, so we should do some tests
+# at this point to see if one is installed
+libtrace_libpacketdump=true
+AC_ARG_ENABLE(libpacketdump,
+              AC_HELP_STRING([--disable-libpacketdump],
+                             [disable building of libpacketdump (enabled by default). libpacketdump needs a c++ compiler to build] ),
+[
+        if test "$enableval" = no -o "$enableval" = false
+        then
+                libtrace_libpacketdump=false
+        else
+                libtrace_libpacketdump=true
+        fi
+],
+[
+        libtrace_libpacketdump=true
+])
+
+if test "$libtrace_libpacketdump" = true; then
+        AC_LANG_PUSH(C++)
+        AC_MSG_CHECKING([if we can compile C++ ])
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+                           [[
+#include <iostream>
+                           ]])],
+                [AC_DEFINE(HAVE_CXX,1,[define to test for presence of a working C++ compiler]) libtrace_cxx=true],
+                [AC_DEFINE(HAVE_CXX,0,[define to test for presence of a working C++ compiler]) libtrace_cxx=false])
+
+        AC_MSG_RESULT($libtrace_cxx)    
+        AC_LANG_POP(C++)
+
+        if test "$libtrace_cxx" = false; then
+                AC_MSG_ERROR([libpacketdump requested, but no C++ compiler found. Build with --disable-libpacketdump if you wish to continue anyway ])
+        fi
+fi
+
+# configure time option for building the libtrace tools
+# one of the tools requires libpacketdump, so won't build if libpacketdump
+# hasn't also been built
+libtrace_tools=true
+AC_ARG_ENABLE(tools,
+              AC_HELP_STRING([--disable-tools],
+                             [disable building of the tools contained in the tools/ directory]),
+[
+        if test "$enableval" = no -o "$enableval" = false
+        then
+                libtrace_tools=false
+        else
+                libtrace_tools=true
+        fi
+        
+],
+[
+        libtrace_tools=true
+]) 
 
 # configure time options for use of DAG cards
@@ -223 +280 @@
 fi
 
-AM_CONDITIONAL(HAVE_DAG, test x$libtrace_dag = xtrue)
-AM_CONDITIONAL(DAG2_4, test x$libtrace_dag2_4 = xtrue)
-
-
-# Check for miscellaneous programs
-AC_CHECK_PROG([libtrace_doxygen], [doxygen], [true], [false])
-
-AM_CONDITIONAL(HAS_DOXYGEN, [test x"$libtrace_doxygen" = xtrue])
 
 
@@ -277 +326 @@
 fi
 
+AM_CONDITIONAL([HAVE_DAG], [test "$libtrace_dag" = true])
+AM_CONDITIONAL([DAG2_4], [test "$libtrace_dag2_4" = true])
+AM_CONDITIONAL([HAVE_CXX], [test "$libtrace_cxx" = true])
+AM_CONDITIONAL([LIBPACKETDUMP], [test "$libtrace_libpacketdump" = true])
+AM_CONDITIONAL([LIBTRACE_TOOLS], [test "$libtrace_tools" = true])
+
+# Check for miscellaneous programs
+AC_CHECK_PROG([libtrace_doxygen], [doxygen], [true], [false])
+
+AM_CONDITIONAL(HAS_DOXYGEN, [test x"$libtrace_doxygen" = xtrue])
 
 
@@ -284 +343 @@
 AC_SUBST([LTLIBOBJS])
 AC_SUBST([MANPAGES])
-AC_SUBST([LIBTRACE_VERSION])
-AC_SUBST(LIBTRACE_LT_VERSION)
 
 dnl and finally, output our Makefiles
@@ -304 +361 @@
 reportopt "Compiled with DAG support (DAG 2.4)" $libtrace_dag2_4
 reportopt "Building man pages/documentation" $libtrace_doxygen
-
+reportopt "Building libpacketdump" $libtrace_libpacketdump
+reportopt "Building tools/ directory" $libtrace_tools
+

libpacketdump/Makefile.am

@@ -1 +1 @@
 lib_LTLIBRARIES = libpacketdump.la
 include_HEADERS = libpacketdump.h 
-
-#LINK_LAYERS=$(addsuffix .so,$(basename $(wildcard link_*.cc)))
-#ETH_LAYERS=$(addsuffix .so,$(basename $(wildcard eth_*.cc)))
-#IP_LAYERS=$(addsuffix .so,$(basename $(wildcard ip_*.cc)))
-#TCP_LAYERS=$(addsuffix .so,$(basename $(wildcard tcp_*.cc)))
 
 LINK_LAYERS=$(wildcard link_*.cc)
@@ -37 +32 @@
 install-exec-local:
         for plugin in $(PLUGINS); do install -D -m 755 $$plugin $(PLUGINDIR)/$$plugin; done
+
+uninstall-exec-local:
+        for plugin in $(PLUGINS); do rm -f $(PLUGINDIR)/$$plugin; done

tools/Makefile.am

@@ -1 @@
-SUBDIRS=traceanon tracedump tracemerge tracertstats tracesplit
+if LIBPACKETDUMP
+TRACEDUMP_DIR=tracedump
+endif
+
+if LIBTRACE_TOOLS
+SUBDIRS=traceanon tracemerge tracertstats tracesplit $(TRACEDUMP_DIR)
+else
+SUBDIRS=
+endif
 
 all-hook: