1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
|
https://github.com/phaag/nfdump/commit/e6261098570f69ad973a7a4ea7aaebb1663712e8
https://github.com/phaag/nfdump/commit/67da975f20076751bce49caf57c89ed21ed92ad0
https://github.com/phaag/nfdump/commit/4652c2014012a81438f53cb590687c8c93419140
From: Peter Haag <flow-dev@pyxis.ch>
Date: Tue, 22 Feb 2022 10:54:19 +0100
Subject: [PATCH] Fix issue #304 - accept CFLAGS
--- a/configure.ac
+++ b/configure.ac
@@ -8,8 +8,11 @@ AC_INIT(nfdump, 1.6.23, peter@people.ops-trust.net)
AC_CONFIG_HEADER([config.h])
AM_INIT_AUTOMAKE([subdir-objects])
+if test "x$CFLAGS" = "x"; then
+ CFLAGS="-g -O3"
+fi
+
# Checks for programs.
-CFLAGS="-g -O3"
AC_PROG_CC([clang gcc])
AX_CHECK_C11
CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -fno-strict-aliasing"
From: Peter Haag <peter@people.ops-trust.net>
Date: Fri, 25 Feb 2022 09:12:27 +0100
Subject: [PATCH] Cleanup automake files. Fixes #304.
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,13 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)
+AC_PREREQ([2.71])
AC_REVISION($Revision: 244 $)dnl
-AC_INIT(nfdump, 1.6.23, peter@people.ops-trust.net)
+AC_INIT([nfdump],[1.6.23],[peter@people.ops-trust.net])
-AC_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([subdir-objects])
+AC_CONFIG_MACRO_DIRS([m4])
if test "x$CFLAGS" = "x"; then
CFLAGS="-g -O3"
@@ -15,7 +16,12 @@ fi
# Checks for programs.
AC_PROG_CC([clang gcc])
AX_CHECK_C11
-CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -fno-strict-aliasing"
+AX_APPEND_FLAG([-Wall], [CFLAGS])
+AX_APPEND_FLAG([-Wstrict-prototypes], [CFLAGS])
+AX_APPEND_FLAG([-Wmissing-prototypes], [CFLAGS])
+AX_APPEND_FLAG([-Wmissing-declarations], [CFLAGS])
+AX_APPEND_FLAG([-Wmissing-noreturn], [CFLAGS])
+AX_APPEND_FLAG([-fno-strict-aliasing], [CFLAGS])
LT_INIT
@@ -59,7 +65,7 @@ if test "${enable_fixtimebug}" = "yes" ; then
fi
AC_PROG_YACC
-AC_PROG_LEX
+AC_PROG_LEX(yywrap)
which $LEX > /dev/null 2>&1
if test $? = 1; then
AC_MSG_ERROR(No lex or flex found on system)
@@ -312,7 +318,11 @@ AC_LINK_IFELSE(
# Checks for header files.
AC_HEADER_DIRENT
-AC_HEADER_STDC
+# Autoupdate added the next two lines to ensure that your configure
+# script's behavior did not change. They are probably safe to remove.
+AC_CHECK_INCLUDES_DEFAULT
+AC_PROG_EGREP
+
AC_CHECK_HEADERS(stdio_ext.h)
AC_CHECK_HEADERS([nameser8_compat.h])
AC_CHECK_HEADERS([features.h arpa/inet.h fcntl.h netinet/in.h fts.h stdint.h stdlib.h stddef.h string.h sys/socket.h syslog.h unistd.h iso/limits_iso.h])
@@ -404,17 +414,14 @@ AC_CHECK_FUNCS(memcmp memcpy memmove memset)
AC_MSG_CHECKING([for union semun])
AC_CACHE_VAL(ac_cv_struct_semun,
[
- AC_TRY_COMPILE(
- [
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <sys/types.h>
#include <sys/ipc.h>
#include <sys/sem.h>;
- ],
- [
+ ]], [[
union semun semdat;
- ],
- ac_cv_struct_semun=yes, ac_cv_struct_semun=no
- )
+ ]])],[ac_cv_struct_semun=yes],[ac_cv_struct_semun=no
+ ])
]
)
@@ -424,7 +431,7 @@ if test "$ac_cv_struct_semun" = "yes"; then
fi
AC_MSG_CHECKING(for the %z format string in printf())
-AC_TRY_RUN([
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <stdio.h>
#include <sys/types.h>
@@ -438,28 +445,38 @@ char string[16];
return i == 5 ? 0 : 1;
}
-],
-[
+]])],[
AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_SIZE_T_Z_FORMAT], [1],
[Define to 1 if you have a printf() that supports the %z format string.])
-],
-[
+],[
AC_MSG_RESULT(no)
-],
-[
+],[
AC_MSG_RESULT(no)
-]
-)
+])
+
+AC_CONFIG_FILES([Makefile bin/Makefile man/Makefile])
+AC_CONFIG_FILES([doc/Makefile])
AC_PATH_PROG([DOXYGEN], [doxygen], [])
AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"])
AM_COND_IF([HAVE_DOXYGEN], AC_CONFIG_FILES([doc/Doxyfile]))
-AC_OUTPUT(doc/Makefile)
-
-#AC_CONFIG_FILES([Makefile])
-AC_OUTPUT(Makefile bin/Makefile man/Makefile)
+AC_OUTPUT
+echo ""
+echo "----------------------------------"
+echo " Build Settings for ${PACKAGE_TARNAME} v${PACKAGE_VERSION}"
+echo "----------------------------------"
+echo " host type = $host_os"
+echo " install dir = $prefix"
+echo " CC = $CC"
+echo " CFLAGS = $AM_CFLAGS $CFLAGS"
+echo " CPPFLAGS = $AM_CPPFLAGS $CPPFLAGS"
+echo " LDFLAGS = $AM_LDFLAGS $LDFLAGS"
+echo " LIBS = $LIBS"
+echo "----------------------------------"
+echo ""
+echo " You can run ./make now."
echo ""
echo "* Many thanks for using nfdump tools"
echo "* Please send bug reports back to me: peter@people.ops-trust.net"
From: Peter Haag <peter@people.ops-trust.net>
Date: Thu, 3 Mar 2022 09:25:15 +0100
Subject: [PATCH] Make configure.ac autoconf 2.69 compatible
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-AC_PREREQ([2.71])
+AC_PREREQ([2.69])
AC_REVISION($Revision: 244 $)dnl
AC_INIT([nfdump],[1.6.23],[peter@people.ops-trust.net])
@@ -47,7 +47,7 @@ if test "${enable_jnat}" = "yes" ; then
fi
if test "${enable_nsel}" = "yes" -a "${enable_jnat}" = "yes"; then
- AC_MSG_ERROR(You can use only one of --enable-nsel or --enable-jnat. CISCO and Juniper are not compatible.)
+ AC_MSG_ERROR([You can use only one of --enable-nsel or --enable-jnat. CISCO and Juniper are not compatible.])
fi
AC_ARG_ENABLE(nel,
@@ -287,7 +287,6 @@ AC_SUBST(FT_INCLUDES)
AC_SUBST(FT_LDFLAGS)
AC_SUBST(LFLAGS)
-
# Checks for libraries.
AC_CHECK_FUNCS(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname,,[AC_CHECK_LIB(socket,gethostbyname)])])
AC_CHECK_FUNCS(setsockopt,,[AC_CHECK_LIB(socket,setsockopt)])
@@ -447,8 +446,7 @@ char string[16];
}
]])],[
AC_MSG_RESULT(yes)
- AC_DEFINE([HAVE_SIZE_T_Z_FORMAT], [1],
- [Define to 1 if you have a printf() that supports the %z format string.])
+ AC_DEFINE([HAVE_SIZE_T_Z_FORMAT], [1], [Define to 1 if you have a printf() that supports the %z format string.])
],[
AC_MSG_RESULT(no)
],[
--- /dev/null
+++ b/m4/extensions.m4
@@ -0,0 +1,4 @@
+dnl Define to empty for the benefit of Autoconf 2.69
+dnl AC_USE_SYSTEM_EXTENSIONS (below) can be used unchanged from Autoconf 2.70+.
+m4_ifndef([AC_CHECK_INCLUDES_DEFAULT],
+ [AC_DEFUN([AC_CHECK_INCLUDES_DEFAULT], [])])
|
