summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuuso Alasuutari2007-01-03 14:52:57 +0200
committerJaka Kranjc2007-01-21 23:11:47 +0100
commit1cad0e6f80d76234242050f17b549dd4c69f5acd (patch)
tree18fc959ae1f289e4f5c69d73be1b1287ccfb7cd4
parent09853c1dbf92ed95fe7c1ce317ae19d87d1a3237 (diff)
wpa_supplicant: Added cross-version var compatibility code.
-rwxr-xr-xnet/wpa_supplicant/CONFIGURE27
-rw-r--r--net/wpa_supplicant/HISTORY1
2 files changed, 27 insertions, 1 deletions
diff --git a/net/wpa_supplicant/CONFIGURE b/net/wpa_supplicant/CONFIGURE
index 17b73af7dd..70a4a2a923 100755
--- a/net/wpa_supplicant/CONFIGURE
+++ b/net/wpa_supplicant/CONFIGURE
@@ -6,6 +6,18 @@ config_query CONFIG_NO_WPA "Build without WPA support?" n &&
if [[ $WPA_RELEASE == old ]]
then
+ if [[ $CONFIG_CTRL_IFACE == unix || $CONFIG_CTRL_IFACE == udp ]]
+ then
+ CONFIG_CTRL_IFACE=y &&
+ persistent_add CONFIG_CTRL_IFACE
+ fi &&
+ if [[ -z $CONFIG_DNET_PCAP ]] &&
+ [[ $CONFIG_L2_PACKET == pcap ]]
+ then
+ CONFIG_DNET_PCAP=y &&
+ persistent_add CONFIG_DNET_PCAP
+ fi &&
+
config_query CONFIG_CTRL_IFACE \
"Build external control interface?" \
y &&
@@ -14,7 +26,20 @@ then
interface?" \
n
else
- config_query CONFIG_NO_WPA2 "Build without WPA2 support?" n &&
+ config_query CONFIG_NO_WPA2 "Build without WPA2 support?" n &&
+
+ if [[ $CONFIG_CTRL_IFACE == y ]]
+ then
+ CONFIG_CTRL_IFACE=unix &&
+ persistent_add CONFIG_CTRL_IFACE
+ fi &&
+ if [[ -z $CONFIG_L2_PACKET ]] &&
+ [[ $CONFIG_DNET_PCAP == y ]]
+ then
+ CONFIG_L2_PACKET=pcap &&
+ persistent_add CONFIG_L2_PACKET
+ fi &&
+
config_query_list CONFIG_CTRL_IFACE \
"Select control interface to build (n is none):" \
unix \
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index 7963c67240..0a8b1f07f1 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -5,6 +5,7 @@
* PREPARE, DETAILS, CONFIGURE, DEPENDS, PRE_BUILD, BUILD: New
stable is 0.5.7, previous stable 0.4.9 becomes old, devel not
available yet.
+ * CONFIGURE: Added cross-version var compatibility code.
2006-12-23 Juuso Alasuutari <iuso@sourcemage.org>
* CONFIGURE: Added query for making config file optional.