summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2014-09-10 02:22:18 +0000
committerRoy Marples <roy@marples.name>2014-09-10 02:22:18 +0000
commitffb70eff1605f7b29e9acbf5a707966dd3c8318f (patch)
treecd57957b2377c25a8ad15005976ff5a05e5c4426 /configure
parent0477b8a434c052542aaed0c593f1b50b55dddefe (diff)
downloaddhcpcd-ffb70eff1605f7b29e9acbf5a707966dd3c8318f.tar.xz
Fix arc4random_uniform test.
Rename if-linux-wireless.c to if-linux-wext.c to better reflect it's purpose.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure38
1 files changed, 19 insertions, 19 deletions
diff --git a/configure b/configure
index 40bd01f8..c5b14213 100755
--- a/configure
+++ b/configure
@@ -419,6 +419,24 @@ fi
XCC="$CC `$SED -n -e 's/CPPFLAGS+=*\(.*\)/\1/p' $CONFIG_MK`"
XCC="$XCC `$SED -n -e 's/CFLAGS+=*\(.*\)/\1/p' $CONFIG_MK`"
+if [ "$OS" = linux ]; then
+ printf "Testing for nl80211 ... "
+ cat <<EOF >_nl80211.c
+#include <linux/nl80211.hx>
+int main(void) {
+ return 0;
+}
+EOF
+ if $XCC _nl80211.c -o _nl80211 2>/dev/null; then
+ echo "yes"
+ echo "#define HAVE_NL80211_H" >>$CONFIG_H
+ else
+ echo "no"
+ echo "DHCPCD_SRCS+= if-linux-wext.c" >>$CONFIG_MK
+ fi
+ rm -f _nl80211.c _nl80211
+fi
+
abort=false
# We require the libc to support non standard functions, like getifaddrs
printf "Testing for getifaddrs ... "
@@ -524,7 +542,7 @@ EOF
ARC4RANDOM_UNIFORM=no
fi
echo "$ARC4RANDOM"
- rm -f _arc4random.c _arc4random
+ rm -f _arc4random_uniform.c _arc4random_uniform
fi
if [ "$ARC4RANDOM_UNIFORM" = no ]; then
echo "COMPAT_SRCS+= compat/arc4random_uniform.c" >>$CONFIG_MK
@@ -1024,24 +1042,6 @@ EOF
$abort && exit 1
fi
-if [ "$OS" = linux ]; then
- printf "Testing for nl80211 ... "
- cat <<EOF >_nl80211.c
-#include <linux/nl80211.h>
-int main(void) {
- return 0;
-}
-EOF
- if $XCC _nl80211.c -o _nl80211 2>/dev/null; then
- echo "yes"
- echo "#define HAVE_NL80211_H" >>$CONFIG_H
- else
- echo "no"
- echo "DHCPCD_SRCS+= if-linux-wireless.c" >>$CONFIG_MK
- fi
- rm -f _nl80211.c _nl80211
-fi
-
# Transform for a make file
SERVICEEXISTS=$(echo "$SERVICEEXISTS" | $SED \
-e 's:\\:\\\\:g' \