summaryrefslogtreecommitdiff
path: root/net/nfdump
diff options
context:
space:
mode:
authorseb <seb@pkgsrc.org>2007-09-12 07:33:29 +0000
committerseb <seb@pkgsrc.org>2007-09-12 07:33:29 +0000
commit793b09801db6f0529b7e94c36573162d01a24fc4 (patch)
tree6e557912ce79bc3f084cd34546b2059ca81f48f5 /net/nfdump
parentf5b59bfa08d77d18e9cacc576937f23983e1ddc7 (diff)
downloadpkgsrc-793b09801db6f0529b7e94c36573162d01a24fc4.tar.gz
Update to version 1.5.5
Please note that nfprofile is no longer built by default: see package option nfdump-nfprofile. Changes since last packaged version (1.5.2): 2007-08-24 stable-1.5.5 - Fix nfprofile bug, nfprofile crashes when last opts line is not valid for some reason. - Fix potential hand for nfexpire, on empty flow directories. 2007-08-08 snapshot-20070808 - Idents may contain '-' in name. - Fixed install bugs in Makefile.in and configure.in - Installs now cleanly on Solaris - Handle 4byte interface numbers in v9. Quick fix: 4bytes reduced to 2bytes. - Fix aggregation bug in statistics. - ftok(3) C library call replaced by more reliable own implementation. Did result in error messages like "Another collector is already running" - Fix minor bugs iin file range selction -R. - Add recursive behaviour for -R <directory> - New option -i can canche Ident descriptor in data files. 2007-03-12 snapshot-20070312 - Bug fix release of 20070306 2007-03-06 snapshot-20070306 - Fix bug in flist.c. Resulted in a coredump when using sub dirs and -R . ( all files ) - Fix minor bug in nfcapd.c. - Extend nfprofile for alerting system of nfsen - special version of profiles - Extend nfprofile for shadow profiles. 2007-08-10 snapshot-20070110 - Fix some compiler warnings, when compiled on a 64bit LINUX - Fixes an sflow bug: IP address was printed in wrong direction. ( lower bits first ) - Add new IP addr taging option -T for easy parsing for nfsen lookups - Add new IP list for massive address filtering: syntax: ip in [ 12345 23456 3456 ....] - Change nfprofile for channel based profiling. This breaks with old nfprofile functionality. - Remove space from ICMP type/code when followed by an IP address 2006-07-21 snapshot-20060809 - Make nfexpire ready for profile expiration - Fix bug in nfrpofile. sub dir hierarchy not handled correctly. 2006-07-21 snapshot-20060721 - Add -N option for plain number output in summary line 2006-07-21 snapshot-20060721 - Do recursive file selection when a directory is given by -R 2006-06-14 snapshot-20060621 - Add srcas/dstas/proto aggregation. Note: This changes the default aggregation behaviour, but gives more flexibility - Add tos to element statistics list 2006-06-14 snapshot-20060614 - Add additional stat line at the end of output - Add new binary nfexpire. Manages data expiry on time and/or size based limits Includes new bookkeeping records in nfcapd. See nfexpire(1) - Add ICMP type/code decoding in flow listing instead of dst port - Add packet repeater in nfcpad/sfcapd. In addition, incoming UDP packets can be directly forwarded to another IP address/Port. See new option -R - Add sub directory hierarchies: Files can be stored into various sub dir levels based on different time formats. see new option -S - Some minor bug fixes. - Code cleanup in nfcapd. better daemonize code and communication with launcher.
Diffstat (limited to 'net/nfdump')
-rw-r--r--net/nfdump/DESCR4
-rw-r--r--net/nfdump/Makefile18
-rw-r--r--net/nfdump/PLIST8
-rw-r--r--net/nfdump/PLIST.nfprofile3
-rw-r--r--net/nfdump/distinfo18
-rw-r--r--net/nfdump/patches/patch-aa44
-rw-r--r--net/nfdump/patches/patch-ab16
-rw-r--r--net/nfdump/patches/patch-ad27
-rw-r--r--net/nfdump/patches/patch-ae27
-rw-r--r--net/nfdump/patches/patch-af33
-rw-r--r--net/nfdump/patches/patch-ag750
11 files changed, 840 insertions, 108 deletions
diff --git a/net/nfdump/DESCR b/net/nfdump/DESCR
index 0fa073febf2..100060a710a 100644
--- a/net/nfdump/DESCR
+++ b/net/nfdump/DESCR
@@ -2,8 +2,8 @@ The nfdump tools collect and process netflow data on the command line.
Nfdump tools:
nfcapd - netflow collector daemon
nfdump - netflow dump
-nfprofile - netflow profiler
+nfprofile - netflow profiler - optional tool
nfreplay - netflow replay
-nfclean.pl - cleanup old data - installed as example
+nfexpire - expire old netflow data
ft2nfdump - read flow-tools format - optional tool
sfcapd - sflow collector daemon - optional tool
diff --git a/net/nfdump/Makefile b/net/nfdump/Makefile
index 93476a402e1..b13e01cd23b 100644
--- a/net/nfdump/Makefile
+++ b/net/nfdump/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2007/08/12 13:57:35 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/12 07:33:30 seb Exp $
#
-DISTNAME= nfdump-1.5.2
-PKGREVISION= 1
+DISTNAME= nfdump-1.5.5
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nfdump/}
@@ -14,7 +13,7 @@ GNU_CONFIGURE= yes
TEST_TARGET= test
PKG_OPTIONS_VAR= PKG_OPTIONS.nfdump
-PKG_SUPPORTED_OPTIONS= nfdump-ftconv nfdump-sflow
+PKG_SUPPORTED_OPTIONS= nfdump-ftconv nfdump-sflow nfdump-nfprofile
.include "../../mk/bsd.options.mk"
PLIST_SRC= ${PKGDIR}/PLIST
@@ -31,11 +30,10 @@ CONFIGURE_ARGS+= --enable-sflow
PLIST_SRC+= ${PKGDIR}/PLIST.sflow
.endif
-EGDIR= ${PREFIX}/share/examples/nfdump
-INSTALLATION_DIRS= share/examples/nfdump
-REPLACE_PERL+= nfclean.pl
-
-post-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/nfclean.pl ${EGDIR}/nfclean.pl
+.if !empty(PKG_OPTIONS:Mnfdump-nfprofile)
+CONFIGURE_ARGS+= --enable-nfprofile
+PLIST_SRC+= ${PKGDIR}/PLIST.nfprofile
+. include "../../databases/rrdtool/buildlink3.mk"
+.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/net/nfdump/PLIST b/net/nfdump/PLIST
index 3a1fc901cf4..94b6429011d 100644
--- a/net/nfdump/PLIST
+++ b/net/nfdump/PLIST
@@ -1,11 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/07/29 21:33:42 seb Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/09/12 07:33:31 seb Exp $
bin/nfcapd
bin/nfdump
-bin/nfprofile
+bin/nfexpire
bin/nfreplay
man/man1/nfcapd.1
man/man1/nfdump.1
-man/man1/nfprofile.1
+man/man1/nfexpire.1
man/man1/nfreplay.1
-share/examples/nfdump/nfclean.pl
-@dirrm share/examples/nfdump
diff --git a/net/nfdump/PLIST.nfprofile b/net/nfdump/PLIST.nfprofile
new file mode 100644
index 00000000000..14cfcade8ba
--- /dev/null
+++ b/net/nfdump/PLIST.nfprofile
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.nfprofile,v 1.1 2007/09/12 07:33:32 seb Exp $
+bin/nfprofile
+man/man1/nfprofile.1
diff --git a/net/nfdump/distinfo b/net/nfdump/distinfo
index fe2b18bda11..789cf2f7616 100644
--- a/net/nfdump/distinfo
+++ b/net/nfdump/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.2 2007/08/12 13:57:35 joerg Exp $
+$NetBSD: distinfo,v 1.3 2007/09/12 07:33:35 seb Exp $
-SHA1 (nfdump-1.5.2.tar.gz) = 180a3b8b2315b5c4d0beb07e5b17817f4bdbb454
-RMD160 (nfdump-1.5.2.tar.gz) = 0fac8ba1dc75163b7d906453581e345e037b3730
-Size (nfdump-1.5.2.tar.gz) = 224287 bytes
-SHA1 (patch-aa) = eb506648e2539092a51df964cd8096b74b4b940d
-SHA1 (patch-ab) = 3b5a57e3384208d5aee2a6741d664ec5b31640ab
+SHA1 (nfdump-1.5.5.tar.gz) = 4ca9f19e809b829e3751b9228a889ed9191f9c44
+RMD160 (nfdump-1.5.5.tar.gz) = e5f92b9c28133db6198caac94c22bd6a9eb545de
+Size (nfdump-1.5.5.tar.gz) = 281546 bytes
+SHA1 (patch-aa) = 71fecf3da59ba91c23d13843bd511738873b0dba
+SHA1 (patch-ab) = 7bbba645159b1d47445a618af4c73ef57889d212
SHA1 (patch-ac) = bba19ce3e28b0d74d06ae694790e7aaeb73bfc6b
-SHA1 (patch-ad) = e9aee08cb58dd541c2d2ca23c0a544f8c8645421
-SHA1 (patch-ae) = 5d9c6da56dece4f4073fb72b7c8ba8042754908c
-SHA1 (patch-af) = 78d0a0d5f93cbe9ec9e93ffc9f10f51743f20fc3
+SHA1 (patch-ae) = fad625c83fc7fad601252236d246286d04eff43d
+SHA1 (patch-af) = 06f045e735b689cd05c140c87753329cf6962d5c
+SHA1 (patch-ag) = c30fe1934eb6ef82882c01e5f1a6f21383976320
diff --git a/net/nfdump/patches/patch-aa b/net/nfdump/patches/patch-aa
index 692a94dedfa..a0cf7434dc7 100644
--- a/net/nfdump/patches/patch-aa
+++ b/net/nfdump/patches/patch-aa
@@ -1,25 +1,37 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/07/29 21:33:42 seb Exp $
+$NetBSD: patch-aa,v 1.2 2007/09/12 07:33:37 seb Exp $
-The source to the configure script is not in the distribution
-tarball.
-
---- configure.orig 2006-05-21 16:30:10.000000000 +0000
-+++ configure
-@@ -3927,7 +3927,7 @@ echo "$as_me: error: Link with \"-lz\" f
- fi
-
+--- configure.in.orig 2007-08-24 12:32:34.000000000 +0000
++++ configure.in
+@@ -84,20 +84,19 @@ AC_CHECK_LIB(z, zlibVersion,,
+ AC_MSG_ERROR(Link with "-lz" failed! (Need zlib >= 1.0.2))
+ )
if test -d "$WHERE_FTPATH"; then
- if test ! -f "$WHERE_FTPATH/lib/ftlib.h"; then
+ if test ! -f "$WHERE_FTPATH/include/flow-tools/ftlib.h"; then
- { { echo "$as_me:$LINENO: error: ftlib.h file not found in flow-tools directory '$WHERE_FTPATH'. Use --with-ftpath=PATH" >&5
- echo "$as_me: error: ftlib.h file not found in flow-tools directory '$WHERE_FTPATH'. Use --with-ftpath=PATH" >&2;}
- { (exit 1); exit 1; }; }
-@@ -3937,7 +3937,7 @@ echo "$as_me: error: ftlib.h file not fo
- echo "$as_me: error: libft.a not found in flow-tools directory '$WHERE_FTPATH'. Build flow tools first" >&2;}
- { (exit 1); exit 1; }; }
+ AC_MSG_ERROR(ftlib.h file not found in flow-tools directory '$WHERE_FTPATH'. Use --with-ftpath=PATH)
+ fi
+ if test ! -f "$WHERE_FTPATH/lib/libft.a"; then
+ AC_MSG_ERROR(libft.a not found in flow-tools directory '$WHERE_FTPATH'. Build flow tools first)
fi
- FT_INCLUDES="-I$WHERE_FTPATH/src -I$WHERE_FTPATH/lib"
+ FT_INCLUDES="-I$WHERE_FTPATH/include/flow-tools"
FT_LDFLAGS="-L$WHERE_FTPATH/lib"
else
- { { echo "$as_me:$LINENO: error: flow-tools directory '$WHERE_FTPATH' does not exists. Use --with-ftpath=PATH" >&5
+ AC_MSG_ERROR(flow-tools directory '$WHERE_FTPATH' does not exists. Use --with-ftpath=PATH)
+ fi
+ opt_objects=ft2nfdump
+ ,
+-opt_objects=
+ )
+
+ AC_ARG_ENABLE(nfprofile,
+@@ -122,8 +121,8 @@ AC_ARG_ENABLE(nfprofile,
+ ],, AC_MSG_ERROR(Can not load rrd library. Not in loader search path! ))
+
+ ]
++opt_objects="$opt_objects nfprofile"
+ ,
+-opt_objects=
+ )
+
+ AC_ARG_ENABLE(sflow,
diff --git a/net/nfdump/patches/patch-ab b/net/nfdump/patches/patch-ab
index 93896b298c7..a1c53579148 100644
--- a/net/nfdump/patches/patch-ab
+++ b/net/nfdump/patches/patch-ab
@@ -1,15 +1,15 @@
-$NetBSD: patch-ab,v 1.1.1.1 2007/07/29 21:33:42 seb Exp $
+$NetBSD: patch-ab,v 1.2 2007/09/12 07:33:37 seb Exp $
There is nothing really useful in flow-tools' ftbuild.h.
---- ft2nfdump.c.orig 2006-07-14 06:09:03.000000000 +0000
+--- ft2nfdump.c.orig 2007-08-24 12:32:34.000000000 +0000
+++ ft2nfdump.c
-@@ -64,7 +64,7 @@
- #endif
+@@ -66,7 +66,7 @@
+ #include "nffile.h"
+ #include "launch.h"
- #include "version.h"
-#include "ftbuild.h"
+/* #include "ftbuild.h" */
- #include "nf_common.h"
- #include "nffile.h"
- #include "launch.h"
+
+ /* Global defines */
+ #define MAXRECORDS 30
diff --git a/net/nfdump/patches/patch-ad b/net/nfdump/patches/patch-ad
deleted file mode 100644
index 543102d7909..00000000000
--- a/net/nfdump/patches/patch-ad
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2007/07/29 21:33:42 seb Exp $
-
---- Makefile.in.orig 2006-05-21 16:30:10.000000000 +0000
-+++ Makefile.in
-@@ -98,13 +98,13 @@ install: $(OBJECTS)
- test -d $(PREFIX)/bin || install -d -o root -g bin -m 755 $(PREFIX)/bin
- test -d $(MANDIR) || install -d -o root -g bin -m 755 $(MANDIR)
- test -d $(MANDIR)/man1 || install -d -o root -g bin -m 755 $(MANDIR)/man1
-+ test -d $(EGDIR)/man1 || install -d -o root -g bin -m 755 $(MANDIR)/man1
- for file in $(OBJECTS); do \
- if [ -f $$file.1 ]; then \
- $(INSTALL) -o root -g bin -m 755 $$file $(PREFIX)/bin ; \
- $(INSTALL) -o root -g bin -m 644 $$file.1 $(MANDIR)/man1 ; \
- fi \
- done;
-- test -f $(PREFIX)/bin/nfclean.pl || $(INSTALL) -o root -g bin -m 755 nfclean.pl $(PREFIX)/bin
-
- uninstall:
- for file in $(OBJECTS); do \
-@@ -113,7 +113,6 @@ uninstall:
- /bin/rm -f $(MANDIR)/man1/$$file.1 ; \
- fi \
- done;
-- /bin/rm -f $(PREFIX)/bin/nfclean.pl
-
- test: nftest
- ./test.sh
diff --git a/net/nfdump/patches/patch-ae b/net/nfdump/patches/patch-ae
index 68d623ce554..c0c8cf328e0 100644
--- a/net/nfdump/patches/patch-ae
+++ b/net/nfdump/patches/patch-ae
@@ -1,33 +1,32 @@
-$NetBSD: patch-ae,v 1.1 2007/08/12 13:57:35 joerg Exp $
+$NetBSD: patch-ae,v 1.2 2007/09/12 07:33:41 seb Exp $
---- nfcapd.c.orig 2007-08-12 13:25:39.000000000 +0000
+--- nfcapd.c.orig 2007-08-24 12:32:34.000000000 +0000
+++ nfcapd.c
-@@ -71,6 +71,7 @@
+@@ -74,6 +74,7 @@
#include <sys/mman.h>
#include <string.h>
#include <dirent.h>
+#include <limits.h>
- #include "config.h"
-
-@@ -511,7 +512,11 @@ int main(int argc, char **argv) {
+ #if 0
+ #include "pcap_reader.h"
+@@ -688,7 +689,11 @@ int main(int argc, char **argv) {
char *bindhost, *filter, *datadir, pidstr[32], *lauch_process;
char *userid, *groupid, *checkptr, *listenport, *mcastgroup;
--char pidfile[MAXNAMLEN];
+#ifdef PATH_MAX
+char pidfile[PATH_MAX];
+#else
-+char pidfile[MAXPATHLEN];
+ char pidfile[MAXPATHLEN];
+#endif
struct stat fstat;
srecord_t *commbuff;
- struct sigaction act;
-@@ -587,18 +592,20 @@ pid_t pid;
+ dirstat_t *dirstat;
+@@ -776,18 +781,20 @@ char c;
break;
case 'P':
if ( optarg[0] == '/' ) { // absolute path given
-- strncpy(pidfile, optarg, MAXNAMLEN-1);
+- strncpy(pidfile, optarg, MAXPATHLEN-1);
+ strncpy(pidfile, optarg, sizeof(pidfile));
+ pidfile[sizeof(pidfile) - 1] = 0;
} else { // path relative to current working directory
@@ -46,7 +45,7 @@ $NetBSD: patch-ae,v 1.1 2007/08/12 13:57:35 joerg Exp $
+ snprintf(pidfile, sizeof(pidfile), "%s/%s", tmp, optarg);
}
- // pidfile now absolute path
-- pidfile[MAXNAMLEN-1] = 0;
+- pidfile[MAXPATHLEN-1] = 0;
break;
- case 'r':
- report_sequence = 1;
+ case 'R': {
+ char *p = strchr(optarg, '/');
diff --git a/net/nfdump/patches/patch-af b/net/nfdump/patches/patch-af
index c3d62e58a76..4c78cd1d53d 100644
--- a/net/nfdump/patches/patch-af
+++ b/net/nfdump/patches/patch-af
@@ -1,38 +1,37 @@
-$NetBSD: patch-af,v 1.1 2007/08/12 13:57:36 joerg Exp $
+$NetBSD: patch-af,v 1.2 2007/09/12 07:33:42 seb Exp $
---- sfcapd.c.orig 2007-08-12 13:30:13.000000000 +0000
+--- sfcapd.c.orig 2007-08-24 12:32:34.000000000 +0000
+++ sfcapd.c
-@@ -60,6 +60,7 @@
+@@ -63,6 +63,7 @@
#include <sys/mman.h>
#include <string.h>
#include <dirent.h>
+#include <limits.h>
- #include "config.h"
-
-@@ -454,7 +455,11 @@ int main(int argc, char **argv) {
+ #if 0
+ #include "pcap_reader.h"
+@@ -626,7 +627,11 @@ int main(int argc, char **argv) {
char *bindhost, *filter, *datadir, pidstr[32], *lauch_process;
char *userid, *groupid, *checkptr, *listenport, *mcastgroup;
--char pidfile[MAXNAMLEN];
+#ifdef PATH_MAX
+char pidfile[PATH_MAX];
+#else
-+char pidfile[MAXPATHLEN];
+ char pidfile[MAXPATHLEN];
+#endif
struct stat fstat;
srecord_t *commbuff;
- struct sigaction act;
-@@ -530,18 +535,20 @@ pid_t pid;
+ dirstat_t *dirstat;
+@@ -712,18 +717,21 @@ char c;
break;
case 'P':
if ( optarg[0] == '/' ) { // absolute path given
-- strncpy(pidfile, optarg, MAXNAMLEN-1);
+- strncpy(pidfile, optarg, MAXPATHLEN-1);
+ strncpy(pidfile, optarg, sizeof(pidfile));
-+ pidfile[sizeof(pidfile) - 1] = '\0'
++ pidfile[sizeof(pidfile) - 1] = 0;
} else { // path relative to current working directory
+#ifdef PATH_MAX
-+ char tmp[PATH_MAX]
++ char tmp[PATH_MAX];
+#else
char tmp[MAXPATHLEN];
- if ( !getcwd(tmp, MAXPATHLEN-1) ) {
@@ -41,12 +40,12 @@ $NetBSD: patch-af,v 1.1 2007/08/12 13:57:36 joerg Exp $
fprintf(stderr, "Failed to get current working directory: %s\n", strerror(errno));
exit(255);
}
-- tmp[MAXPATHLEN-1] = 0;
+ tmp[MAXPATHLEN-1] = 0;
- snprintf(pidfile, MAXPATHLEN - 1 - strlen(tmp), "%s/%s", tmp, optarg);
+ snprintf(pidfile, sizeof(pidfile), "%s/%s", tmp, optarg);
}
- // pidfile now absolute path
-- pidfile[MAXNAMLEN-1] = 0;
+- pidfile[MAXPATHLEN-1] = 0;
break;
- case 'r':
- report_sequence = 1;
+ case 'R': {
+ char *p = strchr(optarg, '/');
diff --git a/net/nfdump/patches/patch-ag b/net/nfdump/patches/patch-ag
new file mode 100644
index 00000000000..1fcc7ec9586
--- /dev/null
+++ b/net/nfdump/patches/patch-ag
@@ -0,0 +1,750 @@
+$NetBSD: patch-ag,v 1.1 2007/09/12 07:33:42 seb Exp $
+
+--- configure.orig 2007-09-11 23:37:10.000000000 +0000
++++ configure
+@@ -959,7 +959,7 @@ esac
+ else
+ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ fi
+- cd "$ac_popdir"
++ cd $ac_popdir
+ done
+ fi
+
+@@ -1894,7 +1894,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -1952,7 +1953,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2068,7 +2070,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2122,7 +2125,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2167,7 +2171,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2211,7 +2216,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2301,7 +2307,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2330,7 +2337,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2400,7 +2408,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2452,7 +2461,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2523,7 +2533,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2575,7 +2586,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2978,7 +2990,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3036,7 +3049,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3152,7 +3166,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3206,7 +3221,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3251,7 +3267,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3295,7 +3312,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3364,7 +3382,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3530,7 +3549,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3596,7 +3616,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3685,7 +3706,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3908,7 +3930,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3948,7 +3971,7 @@ echo "$as_me: error: Link with \"-lz\" f
+ fi
+
+ if test -d "$WHERE_FTPATH"; then
+- if test ! -f "$WHERE_FTPATH/lib/ftlib.h"; then
++ if test ! -f "$WHERE_FTPATH/include/flow-tools/ftlib.h"; then
+ { { echo "$as_me:$LINENO: error: ftlib.h file not found in flow-tools directory '$WHERE_FTPATH'. Use --with-ftpath=PATH" >&5
+ echo "$as_me: error: ftlib.h file not found in flow-tools directory '$WHERE_FTPATH'. Use --with-ftpath=PATH" >&2;}
+ { (exit 1); exit 1; }; }
+@@ -3958,7 +3981,7 @@ echo "$as_me: error: ftlib.h file not fo
+ echo "$as_me: error: libft.a not found in flow-tools directory '$WHERE_FTPATH'. Build flow tools first" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+- FT_INCLUDES="-I$WHERE_FTPATH/src -I$WHERE_FTPATH/lib"
++ FT_INCLUDES="-I$WHERE_FTPATH/include/flow-tools"
+ FT_LDFLAGS="-L$WHERE_FTPATH/lib"
+ else
+ { { echo "$as_me:$LINENO: error: flow-tools directory '$WHERE_FTPATH' does not exists. Use --with-ftpath=PATH" >&5
+@@ -3967,9 +3990,6 @@ echo "$as_me: error: flow-tools director
+ fi
+ opt_objects=ft2nfdump
+
+-else
+- opt_objects=
+-
+ fi;
+
+ ac_ext=c
+@@ -4255,7 +4275,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4425,7 +4446,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4501,7 +4523,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4573,7 +4596,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4749,9 +4773,7 @@ rm -f core *.core gmon.out bb.out confte
+ fi
+
+
+-
+-else
+- opt_objects=
++opt_objects="$opt_objects nfprofile"
+
+ fi;
+
+@@ -4838,7 +4860,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4907,7 +4930,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4979,7 +5003,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5087,7 +5112,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5156,7 +5182,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5235,7 +5262,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5307,7 +5335,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5361,7 +5390,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5432,7 +5462,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5486,7 +5517,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5553,7 +5585,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5729,7 +5762,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5884,7 +5918,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5946,7 +5981,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5986,7 +6022,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6042,7 +6079,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6082,7 +6120,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6146,7 +6185,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6177,8 +6217,10 @@ See \`config.log' for more details." >&2
+ esac
+ else
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
++ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -6334,7 +6376,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6394,7 +6437,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6470,7 +6514,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6512,7 +6557,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6569,7 +6615,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6694,7 +6741,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6759,7 +6807,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6823,7 +6872,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6915,7 +6965,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6970,7 +7021,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7108,7 +7160,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7293,7 +7346,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7590,7 +7644,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7819,7 +7874,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7886,7 +7942,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8070,7 +8127,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8347,7 +8405,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8758,7 +8817,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8827,7 +8887,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8939,7 +9000,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9010,7 +9072,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9916,6 +9979,11 @@ esac
+ *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+ esac
+
++ if test x"$ac_file" != x-; then
++ { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
++ rm -f "$ac_file"
++ fi
+ # Let's still pretend it is `configure' which instantiates (i.e., don't
+ # use $as_me), people would be surprised to read:
+ # /* config.h. Generated by config.status. */
+@@ -9954,12 +10022,6 @@ echo "$as_me: error: cannot find input f
+ fi;;
+ esac
+ done` || { (exit 1); exit 1; }
+-
+- if test x"$ac_file" != x-; then
+- { echo "$as_me:$LINENO: creating $ac_file" >&5
+-echo "$as_me: creating $ac_file" >&6;}
+- rm -f "$ac_file"
+- fi
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+ sed "$ac_vpsub