Changeset 5540efc

Timestamp:

11/02/05 12:04:20 (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:

36093bd

Parents:

5261dbd

Message:

makefile.am error -0 should use uninstall-local apparently
added checks for libgdc, which tracertstats requires

Files:

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

configure.in

@@ -24 +24 @@
 
 AC_CONFIG_LIBOBJ_DIR(lib)
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_C_INLINE
+AC_C_BIGENDIAN
+AC_TYPE_SIZE_T
+AC_HEADER_TIME
+AC_SYS_LARGEFILE
+
+# Checks for library functions.
+AC_PROG_GCC_TRADITIONAL
+AC_CHECK_FUNCS(socket strdup)
 
 # Checks for header files.
@@ -80 +92 @@
 
 
+AC_CHECK_LIB(gdc,GDC_out_graph,
+             libtrace_gdc=true,
+             libtrace_gdc=false)
+
 # Check for various broken functions
 AC_FUNC_MALLOC
@@ -121 +137 @@
 fi
 
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_C_INLINE
-AC_C_BIGENDIAN
-AC_TYPE_SIZE_T
-AC_HEADER_TIME
-AC_SYS_LARGEFILE
-
-# Checks for library functions.
-AC_PROG_GCC_TRADITIONAL
-AC_CHECK_FUNCS(socket strdup)
 
 # configure time options for man pages
@@ -331 +336 @@
 AM_CONDITIONAL([LIBPACKETDUMP], [test "$libtrace_libpacketdump" = true])
 AM_CONDITIONAL([LIBTRACE_TOOLS], [test "$libtrace_tools" = true])
+AM_CONDITIONAL([LIBGDC], [test "$libtrace_gdc" = true])
+
 
 # Check for miscellaneous programs

libpacketdump/Makefile.am

@@ -33 +33 @@
         for plugin in $(PLUGINS); do install -D -m 755 $$plugin $(PLUGINDIR)/$$plugin; done
 
-uninstall-exec-local:
+uninstall-local:
         for plugin in $(PLUGINS); do rm -f $(PLUGINDIR)/$$plugin; done

tools/Makefile.am

@@ +1 @@
+# tracedump depends on libpacketdump
 if LIBPACKETDUMP
 TRACEDUMP_DIR=tracedump
 endif
 
+# tracertstats depends on libgdc
+if LIBGDC
+TRACERTSTATS_DIR=tracertstats
+endif
+
 if LIBTRACE_TOOLS
-SUBDIRS=traceanon tracemerge tracertstats tracesplit $(TRACEDUMP_DIR)
+SUBDIRS=traceanon tracemerge tracesplit $(TRACEDUMP_DIR) $(TRACERTSTATS_DIR)
 else
 SUBDIRS=