diff --git a/ChangeLog b/ChangeLog index 8129340..6d2ca29 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2017-10-22 - Add support for CISCO IOS 8 bytes timestamps ID 21/22 +- Fix issue #72 - multiple stat output +- Change -B behaviour as proposed in issue #59. Should not impact with previous use, but is more flexible +- Add bzip compress switch in usage output of nfpcapd +- Fix compile issues on some platforms +- nfpcapd improvements - still beta software. +- Minor bug fixes 2016-11-25 - Add latency extension to nfpcapd diff --git a/autom4te.cache/output.1 b/autom4te.cache/output.1 index eef38b5..33b8abd 100644 --- a/autom4te.cache/output.1 +++ b/autom4te.cache/output.1 @@ -1,7 +1,7 @@ @%:@! /bin/sh @%:@ From configure.ac Revision: 243 . @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.69 for nfdump 1.6.15-20171105. +@%:@ Generated by GNU Autoconf 2.69 for nfdump 1.6.16. @%:@ @%:@ Report bugs to . @%:@ @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='nfdump' PACKAGE_TARNAME='nfdump' -PACKAGE_VERSION='1.6.15-20171105' -PACKAGE_STRING='nfdump 1.6.15-20171105' +PACKAGE_VERSION='1.6.16' +PACKAGE_STRING='nfdump 1.6.16' PACKAGE_BUGREPORT='peter@people.ops-trust.net' PACKAGE_URL='' @@ -1354,7 +1354,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures nfdump 1.6.15-20171105 to adapt to many kinds of systems. +\`configure' configures nfdump 1.6.16 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1424,7 +1424,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of nfdump 1.6.15-20171105:";; + short | recursive ) echo "Configuration of nfdump 1.6.16:";; esac cat <<\_ACEOF @@ -1554,7 +1554,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -nfdump configure 1.6.15-20171105 +nfdump configure 1.6.16 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2217,7 +2217,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by nfdump $as_me 1.6.15-20171105, which was +It was created by nfdump $as_me 1.6.16, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3087,7 +3087,7 @@ fi # Define the identity of the package. PACKAGE='nfdump' - VERSION='1.6.15-20171105' + VERSION='1.6.16' cat >>confdefs.h <<_ACEOF @@ -17242,7 +17242,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by nfdump $as_me 1.6.15-20171105, which was +This file was extended by nfdump $as_me 1.6.16, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17308,7 +17308,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -nfdump config.status 1.6.15-20171105 +nfdump config.status 1.6.16 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/autom4te.cache/output.2 b/autom4te.cache/output.2 index b5be911..01db0d1 100644 --- a/autom4te.cache/output.2 +++ b/autom4te.cache/output.2 @@ -1,7 +1,7 @@ @%:@! /bin/sh @%:@ From configure.ac Revision: 243 . @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.69 for nfdump 1.6.15-20171105. +@%:@ Generated by GNU Autoconf 2.69 for nfdump 1.6.16. @%:@ @%:@ Report bugs to . @%:@ @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='nfdump' PACKAGE_TARNAME='nfdump' -PACKAGE_VERSION='1.6.15-20171105' -PACKAGE_STRING='nfdump 1.6.15-20171105' +PACKAGE_VERSION='1.6.16' +PACKAGE_STRING='nfdump 1.6.16' PACKAGE_BUGREPORT='peter@people.ops-trust.net' PACKAGE_URL='' @@ -1354,7 +1354,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures nfdump 1.6.15-20171105 to adapt to many kinds of systems. +\`configure' configures nfdump 1.6.16 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1424,7 +1424,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of nfdump 1.6.15-20171105:";; + short | recursive ) echo "Configuration of nfdump 1.6.16:";; esac cat <<\_ACEOF @@ -1554,7 +1554,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -nfdump configure 1.6.15-20171105 +nfdump configure 1.6.16 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2217,7 +2217,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by nfdump $as_me 1.6.15-20171105, which was +It was created by nfdump $as_me 1.6.16, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3087,7 +3087,7 @@ fi # Define the identity of the package. PACKAGE='nfdump' - VERSION='1.6.15-20171105' + VERSION='1.6.16' cat >>confdefs.h <<_ACEOF @@ -17246,7 +17246,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by nfdump $as_me 1.6.15-20171105, which was +This file was extended by nfdump $as_me 1.6.16, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17312,7 +17312,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -nfdump config.status 1.6.15-20171105 +nfdump config.status 1.6.16 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/autom4te.cache/requests b/autom4te.cache/requests index 6f71e53..c83e203 100644 --- a/autom4te.cache/requests +++ b/autom4te.cache/requests @@ -34,47 +34,47 @@ 'configure.ac' ], { - 'AM_DEP_TRACK' => 1, - 'AM_MAKE_INCLUDE' => 1, - 'AC_CONFIG_MACRO_DIR_TRACE' => 1, - '_AM_IF_OPTION' => 1, 'AM_CONDITIONAL' => 1, - '_AM_PROG_TAR' => 1, - 'AM_PROG_INSTALL_SH' => 1, - 'AM_MISSING_PROG' => 1, - '_AM_AUTOCONF_VERSION' => 1, - '_AM_MANGLE_OPTION' => 1, - 'AM_SILENT_RULES' => 1, - 'AM_AUTOMAKE_VERSION' => 1, + 'AM_SET_DEPDIR' => 1, 'AM_SET_LEADING_DOT' => 1, - 'm4_pattern_allow' => 1, + 'AU_DEFUN' => 1, + '_AM_MANGLE_OPTION' => 1, + 'AM_MAKE_INCLUDE' => 1, + '_AM_CONFIG_MACRO_DIRS' => 1, + 'AC_DEFUN' => 1, + '_AM_SUBST_NOTMAKE' => 1, + 'AM_SILENT_RULES' => 1, + '_m4_warn' => 1, + 'AM_MISSING_PROG' => 1, + '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + 'AC_CONFIG_MACRO_DIR' => 1, + 'AC_CONFIG_MACRO_DIR_TRACE' => 1, + '_AM_SET_OPTION' => 1, + '_AM_SET_OPTIONS' => 1, + '_AM_AUTOCONF_VERSION' => 1, + '_AM_PROG_TAR' => 1, + '_AM_PROG_CC_C_O' => 1, + 'm4_pattern_forbid' => 1, + '_AM_DEPENDENCIES' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, 'AM_PROG_CC_C_O' => 1, 'AM_RUN_LOG' => 1, - 'AM_SUBST_NOTMAKE' => 1, - 'm4_include' => 1, 'AM_MISSING_HAS_RUN' => 1, - 'AU_DEFUN' => 1, - '_AM_CONFIG_MACRO_DIRS' => 1, - '_AM_DEPENDENCIES' => 1, - 'AC_DEFUN_ONCE' => 1, - '_m4_warn' => 1, - 'AM_SANITY_CHECK' => 1, - '_AM_SET_OPTION' => 1, - 'AM_SET_DEPDIR' => 1, - '_AM_SET_OPTIONS' => 1, - 'include' => 1, - 'AM_PROG_INSTALL_STRIP' => 1, - '_AM_PROG_CC_C_O' => 1, - '_AC_AM_CONFIG_HEADER_HOOK' => 1, - '_AM_SUBST_NOTMAKE' => 1, - 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'AC_DEFUN' => 1, - 'm4_pattern_forbid' => 1, 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, + '_AC_AM_CONFIG_HEADER_HOOK' => 1, + 'AM_PROG_INSTALL_STRIP' => 1, 'AM_INIT_AUTOMAKE' => 1, - 'AC_CONFIG_MACRO_DIR' => 1, - 'AM_AUX_DIR_EXPAND' => 1 + 'AC_DEFUN_ONCE' => 1, + 'AM_SANITY_CHECK' => 1, + 'include' => 1, + 'm4_include' => 1, + 'AM_PROG_INSTALL_SH' => 1, + '_AM_IF_OPTION' => 1, + 'm4_pattern_allow' => 1, + 'AM_SUBST_NOTMAKE' => 1, + 'AM_AUX_DIR_EXPAND' => 1, + 'AM_DEP_TRACK' => 1 } ], 'Autom4te::Request' ), bless( [ @@ -89,65 +89,65 @@ 'configure.ac' ], { - 'AC_CANONICAL_BUILD' => 1, - 'AC_FC_FREEFORM' => 1, - 'AC_CANONICAL_SYSTEM' => 1, - 'AC_CONFIG_SUBDIRS' => 1, - 'sinclude' => 1, - 'AC_FC_PP_DEFINE' => 1, - '_AM_COND_ELSE' => 1, - 'AM_PROG_CXX_C_O' => 1, - 'AM_GNU_GETTEXT' => 1, - 'AC_DEFINE_TRACE_LITERAL' => 1, - 'AM_CONDITIONAL' => 1, - 'AM_PROG_FC_C_O' => 1, - 'AM_MAINTAINER_MODE' => 1, - 'AC_FC_SRCEXT' => 1, - 'm4_sinclude' => 1, - 'AM_XGETTEXT_OPTION' => 1, - 'AM_EXTRA_RECURSIVE_TARGETS' => 1, - 'AM_SILENT_RULES' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - 'AC_REQUIRE_AUX_FILE' => 1, - 'AM_NLS' => 1, - 'AC_SUBST_TRACE' => 1, - '_AM_COND_IF' => 1, - 'm4_pattern_allow' => 1, - 'AM_PROG_CC_C_O' => 1, - 'AM_PROG_AR' => 1, - 'm4_include' => 1, - 'AM_ENABLE_MULTILIB' => 1, - 'AC_SUBST' => 1, 'AC_CONFIG_LIBOBJ_DIR' => 1, - '_m4_warn' => 1, - '_AM_MAKEFILE_INCLUDE' => 1, - 'AC_LIBSOURCE' => 1, - 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, - 'AM_PROG_MKDIR_P' => 1, - 'AC_PROG_LIBTOOL' => 1, - 'AC_CONFIG_FILES' => 1, - 'include' => 1, + 'AM_PROG_FC_C_O' => 1, + 'm4_pattern_allow' => 1, + 'AC_SUBST' => 1, + 'AC_CANONICAL_SYSTEM' => 1, 'AM_PATH_GUILE' => 1, - 'AC_CONFIG_LINKS' => 1, - 'AM_POT_TOOLS' => 1, - 'AC_CANONICAL_HOST' => 1, - '_AM_SUBST_NOTMAKE' => 1, - 'AH_OUTPUT' => 1, - 'AC_FC_PP_SRCEXT' => 1, - 'LT_INIT' => 1, - 'AM_PROG_MOC' => 1, - 'LT_CONFIG_LTDL_DIR' => 1, - 'AM_PROG_F77_C_O' => 1, + 'AM_PROG_MKDIR_P' => 1, 'AC_CONFIG_AUX_DIR' => 1, - 'AM_MAKEFILE_INCLUDE' => 1, - 'LT_SUPPORTED_TAG' => 1, - 'AC_INIT' => 1, - 'm4_pattern_forbid' => 1, + 'AC_CONFIG_FILES' => 1, + 'sinclude' => 1, + 'AM_PROG_AR' => 1, 'AC_CANONICAL_TARGET' => 1, + 'AH_OUTPUT' => 1, + 'AC_SUBST_TRACE' => 1, '_LT_AC_TAGCONFIG' => 1, + 'AM_GNU_GETTEXT' => 1, + 'LT_INIT' => 1, + 'AM_XGETTEXT_OPTION' => 1, + 'LT_CONFIG_LTDL_DIR' => 1, + 'AC_CONFIG_SUBDIRS' => 1, + 'AM_PROG_F77_C_O' => 1, + 'AM_POT_TOOLS' => 1, + 'include' => 1, + 'm4_include' => 1, + 'AC_CONFIG_LINKS' => 1, + 'AM_ENABLE_MULTILIB' => 1, + 'AC_CANONICAL_HOST' => 1, 'AM_INIT_AUTOMAKE' => 1, + 'AC_FC_FREEFORM' => 1, + 'AM_EXTRA_RECURSIVE_TARGETS' => 1, + 'AC_INIT' => 1, + 'AC_CANONICAL_BUILD' => 1, + 'm4_sinclude' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + 'AM_PROG_CC_C_O' => 1, + 'AM_PROG_MOC' => 1, 'AC_CONFIG_HEADERS' => 1, - '_AM_COND_ENDIF' => 1 + '_m4_warn' => 1, + 'AM_SILENT_RULES' => 1, + 'AC_LIBSOURCE' => 1, + 'AM_MAINTAINER_MODE' => 1, + 'AM_PROG_CXX_C_O' => 1, + 'AM_NLS' => 1, + 'm4_pattern_forbid' => 1, + 'AC_PROG_LIBTOOL' => 1, + 'AC_REQUIRE_AUX_FILE' => 1, + 'LT_SUPPORTED_TAG' => 1, + 'AC_DEFINE_TRACE_LITERAL' => 1, + '_AM_COND_ELSE' => 1, + '_AM_MAKEFILE_INCLUDE' => 1, + '_AM_SUBST_NOTMAKE' => 1, + 'AM_MAKEFILE_INCLUDE' => 1, + 'AM_CONDITIONAL' => 1, + 'AC_FC_PP_SRCEXT' => 1, + '_AM_COND_ENDIF' => 1, + 'AC_FC_PP_DEFINE' => 1, + 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, + '_AM_COND_IF' => 1, + 'AC_FC_SRCEXT' => 1 } ], 'Autom4te::Request' ), bless( [ @@ -188,185 +188,185 @@ 'configure.ac' ], { - 'AC_LIBTOOL_WIN32_DLL' => 1, - 'LT_CMD_MAX_LEN' => 1, - 'LT_SYS_DLSEARCH_PATH' => 1, - '_LT_LINKER_BOILERPLATE' => 1, - 'AC_LIBTOOL_LINKER_OPTION' => 1, - 'm4_include' => 1, - '_LT_AC_LANG_GCJ_CONFIG' => 1, - '_LT_AC_SYS_LIBPATH_AIX' => 1, - '_LT_AC_CHECK_DLFCN' => 1, - 'AC_PROG_LD_GNU' => 1, - '_AM_MANGLE_OPTION' => 1, - '_LT_COMPILER_BOILERPLATE' => 1, - 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - '_LT_AC_PROG_CXXCPP' => 1, - '_AM_IF_OPTION' => 1, - 'AM_DISABLE_STATIC' => 1, - 'LTOBSOLETE_VERSION' => 1, - '_LT_AC_FILE_LTDLL_C' => 1, - 'AC_LIBTOOL_FC' => 1, - 'AC_ENABLE_SHARED' => 1, - 'LT_FUNC_ARGZ' => 1, - 'AM_MAKE_INCLUDE' => 1, - 'AC_LTDL_ENABLE_INSTALL' => 1, - '_LT_PROG_F77' => 1, - 'LT_PATH_LD' => 1, - 'LTDL_CONVENIENCE' => 1, - 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, - 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, + 'AC_LIBTOOL_DLOPEN' => 1, + 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, - 'LT_CONFIG_LTDL_DIR' => 1, - '_LT_AC_LANG_CXX_CONFIG' => 1, - 'AC_PROG_LD' => 1, - 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - '_LT_AC_PROG_ECHO_BACKSLASH' => 1, + '_LT_AC_LOCK' => 1, + 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, + 'AM_DISABLE_STATIC' => 1, + 'AC_LIBTOOL_CXX' => 1, + 'AC_LTDL_SHLIBEXT' => 1, + '_LT_PATH_TOOL_PREFIX' => 1, + 'AM_SANITY_CHECK' => 1, + 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, + '_LT_CC_BASENAME' => 1, + 'LT_CMD_MAX_LEN' => 1, + 'AC_DISABLE_SHARED' => 1, + 'AC_LIBTOOL_SETUP' => 1, + '_LT_PROG_CXX' => 1, + 'LT_SYS_MODULE_PATH' => 1, + '_LT_LIBOBJ' => 1, + '_LT_AC_TAGVAR' => 1, + 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, + 'AM_DEP_TRACK' => 1, + 'AC_LIBTOOL_GCJ' => 1, + 'AM_SUBST_NOTMAKE' => 1, + '_AM_MANGLE_OPTION' => 1, + 'AM_MAKE_INCLUDE' => 1, + 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, + 'AC_LIB_LTDL' => 1, + '_LT_DLL_DEF_P' => 1, + '_LT_LINKER_OPTION' => 1, + '_LT_AC_FILE_LTDLL_C' => 1, + 'AC_LTDL_OBJDIR' => 1, + 'AC_DEFUN' => 1, 'LT_FUNC_DLSYM_USCORE' => 1, - 'AM_PROG_INSTALL_STRIP' => 1, - 'LTSUGAR_VERSION' => 1, + '_LT_AC_SHELL_INIT' => 1, + 'LT_LIB_DLLOAD' => 1, + 'AC_CONFIG_MACRO_DIR_TRACE' => 1, + '_AM_SET_OPTIONS' => 1, + 'AC_LIBTOOL_F77' => 1, + 'LT_FUNC_ARGZ' => 1, + 'AM_RUN_LOG' => 1, + '_LT_AC_LANG_F77_CONFIG' => 1, + '_LT_COMPILER_BOILERPLATE' => 1, + 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + 'AC_LTDL_ENABLE_INSTALL' => 1, + 'AM_PROG_CC_C_O' => 1, + 'LTDL_INIT' => 1, + 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, + 'AC_LIBTOOL_CONFIG' => 1, + 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, + 'AC_DEFUN_ONCE' => 1, + '_LT_AC_PROG_ECHO_BACKSLASH' => 1, + 'AC_PROG_LD_GNU' => 1, + 'AM_MISSING_HAS_RUN' => 1, + '_AC_AM_CONFIG_HEADER_HOOK' => 1, + 'm4_include' => 1, + 'AC_LTDL_PREOPEN' => 1, + 'AM_PROG_INSTALL_SH' => 1, + 'LT_CONFIG_LTDL_DIR' => 1, + 'LT_LIB_M' => 1, + 'AC_LTDL_DLLIB' => 1, + '_LT_PROG_FC' => 1, + 'LT_AC_PROG_GCJ' => 1, + '_LT_AC_LANG_GCJ' => 1, + '_AC_PROG_LIBTOOL' => 1, + 'LT_INIT' => 1, + 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, + 'AC_PATH_TOOL_PREFIX' => 1, + 'AC_LIBTOOL_LINKER_OPTION' => 1, + 'LTDL_CONVENIENCE' => 1, + 'AC_PROG_LD' => 1, + '_LT_AC_LANG_CXX_CONFIG' => 1, + 'AC_LTDL_SYSSEARCHPATH' => 1, + 'AC_DISABLE_STATIC' => 1, + 'LT_PATH_NM' => 1, + 'LT_PATH_LD' => 1, + 'AC_LTDL_SHLIBPATH' => 1, + 'AM_CONDITIONAL' => 1, + 'LT_PROG_GO' => 1, + 'AC_LIBTOOL_COMPILER_OPTION' => 1, + '_LTDL_SETUP' => 1, + '_LT_PREPARE_SED_QUOTE_VARS' => 1, + 'LT_OUTPUT' => 1, + 'AC_CHECK_LIBM' => 1, + '_AM_PROG_CC_C_O' => 1, + 'AC_LIBTOOL_FC' => 1, + '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, 'AC_LIBTOOL_PROG_CC_C_O' => 1, + 'LT_LANG' => 1, + 'LT_SYS_DLOPEN_DEPLIBS' => 1, + 'AC_PROG_EGREP' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, + 'LT_SYS_DLSEARCH_PATH' => 1, + '_LT_AC_LANG_F77' => 1, + 'AM_PROG_INSTALL_STRIP' => 1, + 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, + '_LT_COMPILER_OPTION' => 1, + 'AM_PROG_LD' => 1, + 'include' => 1, + 'AM_DISABLE_SHARED' => 1, + '_LT_WITH_SYSROOT' => 1, + 'AC_LIBTOOL_PICMODE' => 1, + 'AC_LIBLTDL_CONVENIENCE' => 1, + 'AC_WITH_LTDL' => 1, + '_LT_AC_TAGCONFIG' => 1, + '_LT_AC_LANG_GCJ_CONFIG' => 1, + 'AC_PATH_MAGIC' => 1, + 'AC_PROG_LD_RELOAD_FLAG' => 1, + 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, + 'AC_LIBTOOL_OBJDIR' => 1, + 'AM_AUX_DIR_EXPAND' => 1, + '_LT_AC_TRY_DLOPEN_SELF' => 1, + 'AM_PROG_LIBTOOL' => 1, + '_LT_AC_PROG_CXXCPP' => 1, + '_LT_AC_LANG_C_CONFIG' => 1, + 'AC_DISABLE_FAST_INSTALL' => 1, + 'LTDL_INSTALLABLE' => 1, + 'AC_LTDL_DLSYM_USCORE' => 1, + 'AM_SET_LEADING_DOT' => 1, + 'AM_ENABLE_STATIC' => 1, + '_AM_SUBST_NOTMAKE' => 1, + 'AC_LIBTOOL_DLOPEN_SELF' => 1, + 'LT_PROG_GCJ' => 1, + 'LT_PROG_RC' => 1, + 'AC_PROG_LIBTOOL' => 1, + '_LT_AC_SYS_COMPILER' => 1, + '_AM_PROG_TAR' => 1, + 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, + 'LT_AC_PROG_SED' => 1, + 'm4_pattern_forbid' => 1, + '_AM_DEPENDENCIES' => 1, + 'AC_LTDL_SYMBOL_USCORE' => 1, + 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, + 'AM_SILENT_RULES' => 1, + 'AC_CONFIG_MACRO_DIR' => 1, + 'LT_AC_PROG_RC' => 1, + 'LTOBSOLETE_VERSION' => 1, + 'LTSUGAR_VERSION' => 1, + 'AC_PROG_NM' => 1, + '_LT_LINKER_BOILERPLATE' => 1, + 'AC_ENABLE_STATIC' => 1, + 'AC_LIBTOOL_RC' => 1, + 'AM_INIT_AUTOMAKE' => 1, + 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, + 'AC_DEPLIBS_CHECK_METHOD' => 1, + 'AC_ENABLE_SHARED' => 1, + 'AC_ENABLE_FAST_INSTALL' => 1, + 'LTVERSION_VERSION' => 1, + '_LT_AC_LANG_RC_CONFIG' => 1, + '_LT_AC_SYS_LIBPATH_AIX' => 1, + '_LT_REQUIRED_DARWIN_CHECKS' => 1, + 'LT_AC_PROG_EGREP' => 1, + 'AM_PROG_NM' => 1, + '_AM_IF_OPTION' => 1, + 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, + '_LT_AC_LANG_CXX' => 1, + 'm4_pattern_allow' => 1, + 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, + 'AC_LIBTOOL_WIN32_DLL' => 1, + 'LT_SYS_DLOPEN_SELF' => 1, + 'AC_LIBLTDL_INSTALLABLE' => 1, + '_AM_CONFIG_MACRO_DIRS' => 1, + 'AM_SET_DEPDIR' => 1, + 'LT_SYS_SYMBOL_USCORE' => 1, + 'LT_SYS_MODULE_EXT' => 1, + 'AU_DEFUN' => 1, + '_LT_PROG_LTMAIN' => 1, + 'LTOPTIONS_VERSION' => 1, + '_LT_PROG_F77' => 1, + 'LT_SUPPORTED_TAG' => 1, + '_LT_AC_CHECK_DLFCN' => 1, + '_LT_PROG_ECHO_BACKSLASH' => 1, + 'AM_MISSING_PROG' => 1, '_m4_warn' => 1, '_AM_SET_OPTION' => 1, - 'LT_LANG' => 1, - 'AC_LTDL_SYMBOL_USCORE' => 1, - 'AC_DISABLE_SHARED' => 1, - 'AC_ENABLE_STATIC' => 1, - 'AM_SET_LEADING_DOT' => 1, - 'LT_PROG_GO' => 1, - '_LT_LINKER_OPTION' => 1, - 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, - 'AM_RUN_LOG' => 1, - 'LT_PROG_RC' => 1, - 'LT_AC_PROG_SED' => 1, - 'AC_PROG_NM' => 1, - 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, - 'LT_SYS_DLOPEN_SELF' => 1, - 'AC_LTDL_SHLIBEXT' => 1, - 'LT_SYS_DLOPEN_DEPLIBS' => 1, - 'AC_LTDL_PREOPEN' => 1, - '_AM_AUTOCONF_VERSION' => 1, - '_LT_COMPILER_OPTION' => 1, - 'AM_PROG_NM' => 1, - 'AC_LIBLTDL_INSTALLABLE' => 1, - 'LT_AC_PROG_EGREP' => 1, - 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, - 'AC_CONFIG_MACRO_DIR' => 1, - 'AM_INIT_AUTOMAKE' => 1, - '_LT_AC_TAGCONFIG' => 1, - 'AM_AUX_DIR_EXPAND' => 1, - 'm4_pattern_forbid' => 1, 'AC_LIBTOOL_LANG_C_CONFIG' => 1, - 'AC_LIBTOOL_CONFIG' => 1, - 'AC_LTDL_SYSSEARCHPATH' => 1, - 'AC_LIBTOOL_GCJ' => 1, - 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, - 'LTVERSION_VERSION' => 1, - '_LT_REQUIRED_DARWIN_CHECKS' => 1, - 'AC_ENABLE_FAST_INSTALL' => 1, - '_AC_AM_CONFIG_HEADER_HOOK' => 1, - '_AM_PROG_CC_C_O' => 1, - '_AM_SUBST_NOTMAKE' => 1, - 'AC_PATH_TOOL_PREFIX' => 1, - '_LT_PROG_CXX' => 1, - 'AC_LIBTOOL_SETUP' => 1, - 'AM_DISABLE_SHARED' => 1, - '_LT_AC_SYS_COMPILER' => 1, - 'AC_LTDL_OBJDIR' => 1, - 'AC_PROG_LIBTOOL' => 1, - 'AC_LTDL_SHLIBPATH' => 1, - '_LT_AC_TAGVAR' => 1, - '_LT_AC_LANG_CXX' => 1, - '_AM_CONFIG_MACRO_DIRS' => 1, - 'AC_LIBTOOL_F77' => 1, - 'LT_PROG_GCJ' => 1, - 'AU_DEFUN' => 1, - 'AM_MISSING_HAS_RUN' => 1, - 'AC_LIBLTDL_CONVENIENCE' => 1, - 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, - 'AC_LIBTOOL_CXX' => 1, - 'LT_SYS_MODULE_EXT' => 1, - 'AM_SUBST_NOTMAKE' => 1, - 'm4_pattern_allow' => 1, - 'AC_DISABLE_STATIC' => 1, - '_LTDL_SETUP' => 1, - 'AC_LIB_LTDL' => 1, + '_AM_AUTOCONF_VERSION' => 1, 'AM_ENABLE_SHARED' => 1, - 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, - 'AM_MISSING_PROG' => 1, - 'LTDL_INSTALLABLE' => 1, - 'AM_ENABLE_STATIC' => 1, - 'AC_DISABLE_FAST_INSTALL' => 1, - 'AC_LIBTOOL_DLOPEN_SELF' => 1, - 'AM_PROG_INSTALL_SH' => 1, - '_AM_PROG_TAR' => 1, - '_LT_PREPARE_SED_QUOTE_VARS' => 1, - 'AC_PATH_MAGIC' => 1, - 'AC_LIBTOOL_RC' => 1, - 'AC_WITH_LTDL' => 1, - 'LTOPTIONS_VERSION' => 1, - 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, - 'AC_DEPLIBS_CHECK_METHOD' => 1, - 'AC_LIBTOOL_DLOPEN' => 1, - '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'AC_LIBTOOL_COMPILER_OPTION' => 1, - 'AC_LIBTOOL_OBJDIR' => 1, - 'AC_LIBTOOL_PICMODE' => 1, - 'include' => 1, - '_LT_AC_LANG_RC_CONFIG' => 1, - 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, - 'AC_LTDL_DLLIB' => 1, - 'AM_SET_DEPDIR' => 1, - 'LT_LIB_M' => 1, - '_LT_LIBOBJ' => 1, - 'LT_WITH_LTDL' => 1, - '_LT_AC_LANG_F77' => 1, - 'AC_DEFUN_ONCE' => 1, - 'AC_PROG_LD_RELOAD_FLAG' => 1, - 'AM_PROG_LIBTOOL' => 1, - '_LT_AC_LANG_F77_CONFIG' => 1, - 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, - 'AC_CHECK_LIBM' => 1, - '_LT_PROG_FC' => 1, - 'LT_AC_PROG_RC' => 1, - '_LT_PROG_ECHO_BACKSLASH' => 1, - 'AM_PROG_CC_C_O' => 1, - '_LT_PROG_LTMAIN' => 1, - '_LT_PATH_TOOL_PREFIX' => 1, - 'AM_SILENT_RULES' => 1, - 'AC_LTDL_DLSYM_USCORE' => 1, - 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, - 'AC_CONFIG_MACRO_DIR_TRACE' => 1, - 'AM_CONDITIONAL' => 1, - '_LT_AC_LANG_C_CONFIG' => 1, - '_LT_CC_BASENAME' => 1, - 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, - 'AM_PROG_LD' => 1, - 'AM_DEP_TRACK' => 1, - 'LT_SYS_SYMBOL_USCORE' => 1, - 'LTDL_INIT' => 1, - '_LT_AC_TRY_DLOPEN_SELF' => 1, - 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, - '_LT_DLL_DEF_P' => 1, - 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, - 'AC_DEFUN' => 1, - '_LT_AC_LOCK' => 1, - 'LT_SYS_MODULE_PATH' => 1, - 'LT_SUPPORTED_TAG' => 1, - 'LT_PATH_NM' => 1, - 'LT_INIT' => 1, - 'LT_AC_PROG_GCJ' => 1, - '_AC_PROG_LIBTOOL' => 1, - 'LT_LIB_DLLOAD' => 1, - '_LT_AC_SHELL_INIT' => 1, - '_AM_SET_OPTIONS' => 1, - '_LT_AC_LANG_GCJ' => 1, - 'AC_PROG_EGREP' => 1, - '_LT_WITH_SYSROOT' => 1, - 'LT_OUTPUT' => 1, - '_AM_DEPENDENCIES' => 1, - 'AM_SANITY_CHECK' => 1 + 'LT_WITH_LTDL' => 1 } ], 'Autom4te::Request' ) ); diff --git a/autom4te.cache/traces.1 b/autom4te.cache/traces.1 index 97cd119..bcac5bb 100644 --- a/autom4te.cache/traces.1 +++ b/autom4te.cache/traces.1 @@ -1,4 +1,4 @@ -m4trace:configure.ac:6: -1- AC_INIT([nfdump], [1.6.15-20171105], [peter@people.ops-trust.net]) +m4trace:configure.ac:6: -1- AC_INIT([nfdump], [1.6.16], [peter@people.ops-trust.net]) m4trace:configure.ac:6: -1- m4_pattern_forbid([^_?A[CHUM]_]) m4trace:configure.ac:6: -1- m4_pattern_forbid([_AC_]) m4trace:configure.ac:6: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS']) diff --git a/configure b/configure index 1f90e2d..3a1e800 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac Revision: 243 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for nfdump 1.6.15-20171105. +# Generated by GNU Autoconf 2.69 for nfdump 1.6.16. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='nfdump' PACKAGE_TARNAME='nfdump' -PACKAGE_VERSION='1.6.15-20171105' -PACKAGE_STRING='nfdump 1.6.15-20171105' +PACKAGE_VERSION='1.6.16' +PACKAGE_STRING='nfdump 1.6.16' PACKAGE_BUGREPORT='peter@people.ops-trust.net' PACKAGE_URL='' @@ -1354,7 +1354,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures nfdump 1.6.15-20171105 to adapt to many kinds of systems. +\`configure' configures nfdump 1.6.16 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1424,7 +1424,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of nfdump 1.6.15-20171105:";; + short | recursive ) echo "Configuration of nfdump 1.6.16:";; esac cat <<\_ACEOF @@ -1554,7 +1554,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -nfdump configure 1.6.15-20171105 +nfdump configure 1.6.16 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2217,7 +2217,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by nfdump $as_me 1.6.15-20171105, which was +It was created by nfdump $as_me 1.6.16, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3087,7 +3087,7 @@ fi # Define the identity of the package. PACKAGE='nfdump' - VERSION='1.6.15-20171105' + VERSION='1.6.16' cat >>confdefs.h <<_ACEOF @@ -17242,7 +17242,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by nfdump $as_me 1.6.15-20171105, which was +This file was extended by nfdump $as_me 1.6.16, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17308,7 +17308,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -nfdump config.status 1.6.15-20171105 +nfdump config.status 1.6.16 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 9365c86..76e3373 100755 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_REVISION($Revision: 243 $)dnl -AC_INIT(nfdump, 1.6.15-20171105, peter@people.ops-trust.net) +AC_INIT(nfdump, 1.6.16, peter@people.ops-trust.net) # $Date: 2014-11-16 14:10:20 +0100 (Sun, 16 Nov 2014) $ #AC_CONFIG_SRCDIR([grammar.y]) AC_CONFIG_HEADER([config.h])