Skip to content

Commit aed75e3

Browse files
fklassenfklassen
committed
appneta#136 fix build on Linux systems without kernel source/headers
1 parent 3905371 commit aed75e3

File tree

17 files changed

+41
-35
lines changed

17 files changed

+41
-35
lines changed

‎Makefile.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
184184
PCAP_BPF_H_FILE = @PCAP_BPF_H_FILE@
185185
POSIX_SHELL = @POSIX_SHELL@
186186
PRINTF = @PRINTF@
187+
QUICK_TX_EXAMPLE_DIR = @QUICK_TX_EXAMPLE_DIR@
187188
RANLIB = @RANLIB@
188189
SED = @SED@
189190
SET_MAKE = @SET_MAKE@

‎configure‎

Lines changed: 21 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -771,8 +771,7 @@ LDNETLIB
771771
LDNETINC
772772
SANDBOXED_FALSE
773773
SANDBOXED_TRUE
774-
QUICK_TX_EXAMPLE_FALSE
775-
QUICK_TX_EXAMPLE_TRUE
774+
QUICK_TX_EXAMPLE_DIR
776775
kerneluname
777776
moduledir
778777
KERNEL_DIR
@@ -5199,13 +5198,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
51995198
else
52005199
lt_cv_nm_interface="BSD nm"
52015200
echo "int some_variable = 0;" > conftest.$ac_ext
5202-
(eval echo "\"\$as_me:5202: $ac_compile\"" >&5)
5201+
(eval echo "\"\$as_me:5201: $ac_compile\"" >&5)
52035202
(eval "$ac_compile" 2>conftest.err)
52045203
cat conftest.err >&5
5205-
(eval echo "\"\$as_me:5205: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
5204+
(eval echo "\"\$as_me:5204: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
52065205
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
52075206
cat conftest.err >&5
5208-
(eval echo "\"\$as_me:5208: output\"" >&5)
5207+
(eval echo "\"\$as_me:5207: output\"" >&5)
52095208
cat conftest.out >&5
52105209
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
52115210
lt_cv_nm_interface="MS dumpbin"
@@ -6411,7 +6410,7 @@ ia64-*-hpux*)
64116410
;;
64126411
*-*-irix6*)
64136412
# Find out which ABI we are using.
6414-
echo '#line 6414 "configure"' > conftest.$ac_ext
6413+
echo '#line 6413 "configure"' > conftest.$ac_ext
64156414
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
64166415
(eval $ac_compile) 2>&5
64176416
ac_status=$?
@@ -7937,11 +7936,11 @@ else
79377936
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
79387937
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
79397938
-e 's:$: $lt_compiler_flag:'`
7940-
(eval echo "\"\$as_me:7940: $lt_compile\"" >&5)
7939+
(eval echo "\"\$as_me:7939: $lt_compile\"" >&5)
79417940
(eval "$lt_compile" 2>conftest.err)
79427941
ac_status=$?
79437942
cat conftest.err >&5
7944-
echo "$as_me:7944: \$? = $ac_status" >&5
7943+
echo "$as_me:7943: \$? = $ac_status" >&5
79457944
if (exit $ac_status) && test -s "$ac_outfile"; then
79467945
# The compiler can only warn and ignore the option if not recognized
79477946
# So say no if there are warnings other than the usual output.
@@ -8276,11 +8275,11 @@ else
82768275
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
82778276
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
82788277
-e 's:$: $lt_compiler_flag:'`
8279-
(eval echo "\"\$as_me:8279: $lt_compile\"" >&5)
8278+
(eval echo "\"\$as_me:8278: $lt_compile\"" >&5)
82808279
(eval "$lt_compile" 2>conftest.err)
82818280
ac_status=$?
82828281
cat conftest.err >&5
8283-
echo "$as_me:8283: \$? = $ac_status" >&5
8282+
echo "$as_me:8282: \$? = $ac_status" >&5
82848283
if (exit $ac_status) && test -s "$ac_outfile"; then
82858284
# The compiler can only warn and ignore the option if not recognized
82868285
# So say no if there are warnings other than the usual output.
@@ -8381,11 +8380,11 @@ else
83818380
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
83828381
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
83838382
-e 's:$: $lt_compiler_flag:'`
8384-
(eval echo "\"\$as_me:8384: $lt_compile\"" >&5)
8383+
(eval echo "\"\$as_me:8383: $lt_compile\"" >&5)
83858384
(eval "$lt_compile" 2>out/conftest.err)
83868385
ac_status=$?
83878386
cat out/conftest.err >&5
8388-
echo "$as_me:8388: \$? = $ac_status" >&5
8387+
echo "$as_me:8387: \$? = $ac_status" >&5
83898388
if (exit $ac_status) && test -s out/conftest2.$ac_objext
83908389
then
83918390
# The compiler can only warn and ignore the option if not recognized
@@ -8436,11 +8435,11 @@ else
84368435
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
84378436
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
84388437
-e 's:$: $lt_compiler_flag:'`
8439-
(eval echo "\"\$as_me:8439: $lt_compile\"" >&5)
8438+
(eval echo "\"\$as_me:8438: $lt_compile\"" >&5)
84408439
(eval "$lt_compile" 2>out/conftest.err)
84418440
ac_status=$?
84428441
cat out/conftest.err >&5
8443-
echo "$as_me:8443: \$? = $ac_status" >&5
8442+
echo "$as_me:8442: \$? = $ac_status" >&5
84448443
if (exit $ac_status) && test -s out/conftest2.$ac_objext
84458444
then
84468445
# The compiler can only warn and ignore the option if not recognized
@@ -10820,7 +10819,7 @@ else
1082010819
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1082110820
lt_status=$lt_dlunknown
1082210821
cat > conftest.$ac_ext <<_LT_EOF
10823-
#line 10823 "configure"
10822+
#line 10822 "configure"
1082410823
#include "confdefs.h"
1082510824

1082610825
#if HAVE_DLFCN_H
@@ -10916,7 +10915,7 @@ else
1091610915
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1091710916
lt_status=$lt_dlunknown
1091810917
cat > conftest.$ac_ext <<_LT_EOF
10919-
#line 10919 "configure"
10918+
#line 10918 "configure"
1092010919
#include "confdefs.h"
1092110920

1092210921
#if HAVE_DLFCN_H
@@ -14221,11 +14220,11 @@ else
1422114220
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1422214221
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1422314222
-e 's:$: $lt_compiler_flag:'`
14224-
(eval echo "\"\$as_me:14224: $lt_compile\"" >&5)
14223+
(eval echo "\"\$as_me:14223: $lt_compile\"" >&5)
1422514224
(eval "$lt_compile" 2>conftest.err)
1422614225
ac_status=$?
1422714226
cat conftest.err >&5
14228-
echo "$as_me:14228: \$? = $ac_status" >&5
14227+
echo "$as_me:14227: \$? = $ac_status" >&5
1422914228
if (exit $ac_status) && test -s "$ac_outfile"; then
1423014229
# The compiler can only warn and ignore the option if not recognized
1423114230
# So say no if there are warnings other than the usual output.
@@ -14320,11 +14319,11 @@ else
1432014319
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1432114320
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1432214321
-e 's:$: $lt_compiler_flag:'`
14323-
(eval echo "\"\$as_me:14323: $lt_compile\"" >&5)
14322+
(eval echo "\"\$as_me:14322: $lt_compile\"" >&5)
1432414323
(eval "$lt_compile" 2>out/conftest.err)
1432514324
ac_status=$?
1432614325
cat out/conftest.err >&5
14327-
echo "$as_me:14327: \$? = $ac_status" >&5
14326+
echo "$as_me:14326: \$? = $ac_status" >&5
1432814327
if (exit $ac_status) && test -s out/conftest2.$ac_objext
1432914328
then
1433014329
# The compiler can only warn and ignore the option if not recognized
@@ -14372,11 +14371,11 @@ else
1437214371
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1437314372
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1437414373
-e 's:$: $lt_compiler_flag:'`
14375-
(eval echo "\"\$as_me:14375: $lt_compile\"" >&5)
14374+
(eval echo "\"\$as_me:14374: $lt_compile\"" >&5)
1437614375
(eval "$lt_compile" 2>out/conftest.err)
1437714376
ac_status=$?
1437814377
cat out/conftest.err >&5
14379-
echo "$as_me:14379: \$? = $ac_status" >&5
14378+
echo "$as_me:14378: \$? = $ac_status" >&5
1438014379
if (exit $ac_status) && test -s out/conftest2.$ac_objext
1438114380
then
1438214381
# The compiler can only warn and ignore the option if not recognized
@@ -19991,13 +19990,6 @@ fi
1999119990
if test x$enable_tx_example = xyes; then
1999219991
QUICK_TX_EXAMPLE_DIR=example
1999319992
fi
19994-
if test x$enable_tx_example = xyes; then
19995-
QUICK_TX_EXAMPLE_TRUE=
19996-
QUICK_TX_EXAMPLE_FALSE='#'
19997-
else
19998-
QUICK_TX_EXAMPLE_TRUE='#'
19999-
QUICK_TX_EXAMPLE_FALSE=
20000-
fi
2000119993

2000219994

2000319995
# Check whether --enable-sandboxed was given.
@@ -22420,10 +22412,6 @@ if test -z "${COMPILE_NETMAP_TRUE}" && test -z "${COMPILE_NETMAP_FALSE}"; then
2242022412
as_fn_error "conditional \"COMPILE_NETMAP\" was never defined.
2242122413
Usually this means the macro was only invoked conditionally." "$LINENO" 5
2242222414
fi
22423-
if test -z "${QUICK_TX_EXAMPLE_TRUE}" && test -z "${QUICK_TX_EXAMPLE_FALSE}"; then
22424-
as_fn_error "conditional \"QUICK_TX_EXAMPLE\" was never defined.
22425-
Usually this means the macro was only invoked conditionally." "$LINENO" 5
22426-
fi
2242722415
if test -z "${SANDBOXED_TRUE}" && test -z "${SANDBOXED_FALSE}"; then
2242822416
as_fn_error "conditional \"SANDBOXED\" was never defined.
2242922417
Usually this means the macro was only invoked conditionally." "$LINENO" 5

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1126,7 +1126,7 @@ AC_ARG_ENABLE(quick_tx_example,
11261126
if test x$enable_tx_example = xyes; then
11271127
QUICK_TX_EXAMPLE_DIR=example
11281128
fi
1129-
AM_CONDITIONAL(QUICK_TX_EXAMPLE, test x$enable_tx_example = xyes)
1129+
AC_SUBST(QUICK_TX_EXAMPLE_DIR)
11301130

11311131
dnl * Allow kernel sandbox mode (prevent depmod execution)
11321132
AC_ARG_ENABLE(sandboxed,

‎docs/Makefile.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
128128
PCAP_BPF_H_FILE = @PCAP_BPF_H_FILE@
129129
POSIX_SHELL = @POSIX_SHELL@
130130
PRINTF = @PRINTF@
131+
QUICK_TX_EXAMPLE_DIR = @QUICK_TX_EXAMPLE_DIR@
131132
RANLIB = @RANLIB@
132133
SED = @SED@
133134
SET_MAKE = @SET_MAKE@

‎kernel/Makefile.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
170170
PCAP_BPF_H_FILE = @PCAP_BPF_H_FILE@
171171
POSIX_SHELL = @POSIX_SHELL@
172172
PRINTF = @PRINTF@
173+
QUICK_TX_EXAMPLE_DIR = @QUICK_TX_EXAMPLE_DIR@
173174
RANLIB = @RANLIB@
174175
SED = @SED@
175176
SET_MAKE = @SET_MAKE@

‎kernel/linux/Makefile.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
170170
PCAP_BPF_H_FILE = @PCAP_BPF_H_FILE@
171171
POSIX_SHELL = @POSIX_SHELL@
172172
PRINTF = @PRINTF@
173+
QUICK_TX_EXAMPLE_DIR = @QUICK_TX_EXAMPLE_DIR@
173174
RANLIB = @RANLIB@
174175
SED = @SED@
175176
SET_MAKE = @SET_MAKE@

‎kernel/linux/example/Makefile.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
155155
PCAP_BPF_H_FILE = @PCAP_BPF_H_FILE@
156156
POSIX_SHELL = @POSIX_SHELL@
157157
PRINTF = @PRINTF@
158+
QUICK_TX_EXAMPLE_DIR = @QUICK_TX_EXAMPLE_DIR@
158159
RANLIB = @RANLIB@
159160
SED = @SED@
160161
SET_MAKE = @SET_MAKE@

‎kernel/linux/quick_tx/Makefile.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
179179
PCAP_BPF_H_FILE = @PCAP_BPF_H_FILE@
180180
POSIX_SHELL = @POSIX_SHELL@
181181
PRINTF = @PRINTF@
182+
QUICK_TX_EXAMPLE_DIR = @QUICK_TX_EXAMPLE_DIR@
182183
RANLIB = @RANLIB@
183184
SED = @SED@
184185
SET_MAKE = @SET_MAKE@

‎lib/Makefile.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
155155
PCAP_BPF_H_FILE = @PCAP_BPF_H_FILE@
156156
POSIX_SHELL = @POSIX_SHELL@
157157
PRINTF = @PRINTF@
158+
QUICK_TX_EXAMPLE_DIR = @QUICK_TX_EXAMPLE_DIR@
158159
RANLIB = @RANLIB@
159160
SED = @SED@
160161
SET_MAKE = @SET_MAKE@

‎libopts/Makefile.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
175175
PCAP_BPF_H_FILE = @PCAP_BPF_H_FILE@
176176
POSIX_SHELL = @POSIX_SHELL@
177177
PRINTF = @PRINTF@
178+
QUICK_TX_EXAMPLE_DIR = @QUICK_TX_EXAMPLE_DIR@
178179
RANLIB = @RANLIB@
179180
SED = @SED@
180181
SET_MAKE = @SET_MAKE@

0 commit comments

Comments
 (0)