blob: 97cc2fac2b416039c9b17b4836ac5c69dc95c796 (
plain)
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
|
Index: configure
==================================================================
--- a/configure
+++ b/configure
@@ -360,19 +360,10 @@
esac
else
echo "CPPFLAGS+= -DNDEBUG" >>$CONFIG_MK
fi
-if [ -z "$EMBEDDED" -o "$EMBEDDED" = yes ]; then
- echo "dhcpcd-definitions.conf will be embedded in dhcpcd itself"
- echo "DHCPCD_SRCS+= dhcpcd-embedded.c" >>$CONFIG_MK
-else
- echo "dhcpcd-definitions.conf will be installed to $LIBEXECDIR"
- echo "CFLAGS+= -DEMBEDDED_CONFIG=\\\"$LIBEXECDIR/dhcpcd-definitions.conf\\\"" >>$CONFIG_MK
- echo "EMBEDDEDINSTALL= _embeddedinstall" >>$CONFIG_MK
-fi
-
if [ -n "$FORK" -a "$FORK" != yes -a "$FORK" != true ]; then
echo "There is no fork"
echo "CPPFLAGS+= -DTHERE_IS_NO_FORK" >>$CONFIG_MK
fi
@@ -460,10 +451,19 @@
echo "$CC does not create executables" >&2
exit 1
fi
[ "$CC" != cc ] && echo "CC= $CC" >>$CONFIG_MK
$CC --version | $SED -e '1!d'
+
+if [ -z "$EMBEDDED" -o "$EMBEDDED" = yes ]; then
+ echo "dhcpcd-definitions.conf will be embedded in dhcpcd itself"
+ echo "DHCPCD_SRCS+= dhcpcd-embedded.c" >>$CONFIG_MK
+else
+ echo "dhcpcd-definitions.conf will be installed to $LIBEXECDIR"
+ echo "CPPFLAGS+= -DEMBEDDED_CONFIG=\\\"$LIBEXECDIR/dhcpcd-definitions.conf\\\"" >>$CONFIG_MK
+ echo "EMBEDDEDINSTALL= _embeddedinstall" >>$CONFIG_MK
+fi
if [ "$OS" = linux ]; then
printf "Testing for nl80211 ... "
cat <<EOF >_nl80211.c
#include <linux/nl80211.h>
|
GitWeb
