Skip to content

Commit b563c23

Browse files
committed
Rewrite old messy autotools configure.ac hell. Try to make it clean and remove old
stuff not needed. Fix errors, make library search more automatic and reliable. Add more comments and structure. Add nfdump.pc.in pkg-config config for nfump libraries. Autoconf and me - did not become best friends ...
1 parent faa2983 commit b563c23

54 files changed

Lines changed: 602 additions & 1303 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Makefile.am

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,24 @@ SUBDIRS = src/libnffile src/libnfdump src/output src/netflow src/collector src/m
44
SUBDIRS += src/nfdump src/nfcapd
55
SUBDIRS += src/nfanon src/nfexpire src/nfreplay . src src/test src/nfreader src/inline src/include
66

7-
if SFLOW
87
SUBDIRS += src/sflow
9-
endif
108

11-
if FT2NFDUMP
9+
if BUILD_FT2NFDUMP
1210
SUBDIRS += src/ft2nfdump
1311
endif
1412

15-
if BUILDNFPCAPD
13+
if BUILD_NFPCAPD
1614
SUBDIRS += src/nfpcapd
1715
endif
1816

19-
if NFPROFILE
17+
if BUILD_NFPROFILE
2018
SUBDIRS += src/nfsen
2119
endif
2220

2321
SUBDIRS += man doc
2422

25-
EXTRA_DIST = extra/CreateSubHierarchy.pl LICENSE BSD-license.txt extra/PortTracker.pm extra/nfdump.spec bootstrap
23+
pkgconfigdir = $(libdir)/pkgconfig
24+
pkgconfig_DATA = nfdump.pc
25+
26+
EXTRA_DIST = LICENSE BSD-license.txt bootstrap nfdump.pc.in
27+
EXTRA_DIST += extra/CreateSubHierarchy.pl extra/PortTracker.pm extra/nfdump.spec

0 commit comments

Comments
 (0)