1 From 9da66f0925818ddb12127bfcb46acf79e354cabc Mon Sep 17 00:00:00 2001
2 From: Toni Uhlig <matzeton@googlemail.com>
3 Date: Mon, 18 May 2020 11:36:56 +0200
4 Subject: [PATCH] configure script honors (C|LD)FLAGS
6 Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
8 configure | 32 ++++++++++++++++----------------
9 1 file changed, 16 insertions(+), 16 deletions(-)
11 diff --git a/configure b/configure
12 index 510826a..ceda000 100755
15 @@ -221,8 +221,8 @@ EOF
19 - LDFLAGS="-L $NACL_LIB_DIR"
20 - CFLAGS="-I $NACL_INC_DIR"
21 + LDFLAGS="$LDFLAGS -L $NACL_LIB_DIR"
22 + CFLAGS="$CFLAGS -I $NACL_INC_DIR"
24 $CC $CFLAGS $LDFLAGS -o $TMPDIR/nacltest $TMPDIR/nacltest.c >> config.log 2>&1
25 if [ ! -x $TMPDIR/nacltest ] ; then
26 @@ -268,7 +268,7 @@ int main(void)
31 + $CC $CFLAGS $LDFLAGS \
32 $($PKG_CONFIG --cflags libnl-3.0 2>> config.log) \
33 $($PKG_CONFIG --cflags libnl-genl-3.0 2>> config.log) \
34 -o $TMPDIR/libnltest \
35 @@ -315,7 +315,7 @@ int main(void)
40 + $CC $CFLAGS $LDFLAGS \
41 $($PKG_CONFIG --cflags libnl-route-3.0 2>> config.log) \
42 -o $TMPDIR/libnlroutetest \
43 $TMPDIR/libnlroutetest.c \
44 @@ -350,7 +350,7 @@ int main(void)
48 - $CC -o $TMPDIR/tpacketv3test $TMPDIR/tpacketv3test.c >> config.log 2>&1
49 + $CC $CFLAGS $LDFLAGS -o $TMPDIR/tpacketv3test $TMPDIR/tpacketv3test.c >> config.log 2>&1
50 if [ ! -x $TMPDIR/tpacketv3test ] ; then
53 @@ -383,7 +383,7 @@ int main(void)
57 - $CC -o $TMPDIR/tpacketv2test $TMPDIR/tpacketv2test.c >> config.log 2>&1
58 + $CC $CFLAGS $LDFLAGS -o $TMPDIR/tpacketv2test $TMPDIR/tpacketv2test.c >> config.log 2>&1
59 if [ ! -x $TMPDIR/tpacketv2test ] ; then
62 @@ -410,7 +410,7 @@ int main(void)
66 - $CC -o $TMPDIR/fopencookietest $TMPDIR/fopencookietest.c >> config.log 2>&1
67 + $CC $CFLAGS $LDFLAGS -o $TMPDIR/fopencookietest $TMPDIR/fopencookietest.c >> config.log 2>&1
68 if [ ! -x $TMPDIR/fopencookietest ] ; then
71 @@ -433,7 +433,7 @@ int main(void)
76 + $CC $CFLAGS $LDFLAGS \
77 $($PKG_CONFIG --cflags ncurses 2>> config.log) \
78 -o $TMPDIR/ncursestest $TMPDIR/ncursestest.c \
79 $($PKG_CONFIG --libs ncurses 2>> config.log \
80 @@ -476,7 +476,7 @@ int main(void)
84 - $CC -o $TMPDIR/geoiptest $TMPDIR/geoiptest.c -lGeoIP >> config.log 2>&1
85 + $CC $CFLAGS $LDFLAGS -o $TMPDIR/geoiptest $TMPDIR/geoiptest.c -lGeoIP >> config.log 2>&1
86 if [ ! -x $TMPDIR/geoiptest ] ; then
89 @@ -503,7 +503,7 @@ int main(void)
94 + $CC $CFLAGS $LDFLAGS \
95 $($PKG_CONFIG --cflags libnetfilter_conntrack 2>> config.log) \
98 @@ -536,7 +536,7 @@ int main(void)
102 - $CC -o $TMPDIR/ztest $TMPDIR/ztest.c -lz >> config.log 2>&1
103 + $CC $CFLAGS $LDFLAGS -o $TMPDIR/ztest $TMPDIR/ztest.c -lz >> config.log 2>&1
104 if [ ! -x $TMPDIR/ztest ] ; then
106 echo "CONFIG_LIBZ=0" >> Config
107 @@ -564,7 +564,7 @@ int main(void)
111 - $CC -o $TMPDIR/urcutest $TMPDIR/urcutest.c -lurcu >> config.log 2>&1
112 + $CC $CFLAGS $LDFLAGS -o $TMPDIR/urcutest $TMPDIR/urcutest.c -lurcu >> config.log 2>&1
113 if [ ! -x $TMPDIR/urcutest ] ; then
116 @@ -588,7 +588,7 @@ int main(void)
120 - $CC -o $TMPDIR/pcaptest $TMPDIR/pcaptest.c -lpcap >> config.log 2>&1
121 + $CC $CFLAGS $LDFLAGS -o $TMPDIR/pcaptest $TMPDIR/pcaptest.c -lpcap >> config.log 2>&1
122 if [ ! -x $TMPDIR/pcaptest ] ; then
124 echo "CONFIG_LIBPCAP=0" >> Config
125 @@ -638,7 +638,7 @@ int main(void)
129 - $CC -o $TMPDIR/hwtstest $TMPDIR/hwtstest.c >> config.log 2>&1
130 + $CC $CFLAGS $LDFLAGS -o $TMPDIR/hwtstest $TMPDIR/hwtstest.c >> config.log 2>&1
131 if [ ! -x $TMPDIR/hwtstest ] ; then
133 echo "CONFIG_HWTSTAMP=0" >> Config
134 @@ -663,7 +663,7 @@ int main(void)
138 - $CC -o $TMPDIR/clitest $TMPDIR/clitest.c -lcli >> config.log 2>&1
139 + $CC $CFLAGS $LDFLAGS -o $TMPDIR/clitest $TMPDIR/clitest.c -lcli >> config.log 2>&1
140 if [ ! -x $TMPDIR/clitest ] ; then
143 @@ -687,7 +687,7 @@ int main(void)
147 - $CC -o $TMPDIR/nettest $TMPDIR/nettest.c -lnet >> config.log 2>&1
148 + $CC $CFLAGS $LDFLAGS -o $TMPDIR/nettest $TMPDIR/nettest.c -lnet >> config.log 2>&1
149 if [ ! -x $TMPDIR/nettest ] ; then