summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaka Kranjc2007-11-14 10:49:55 +0000
committerJaka Kranjc2007-11-14 20:21:08 +0000
commitdf2ba28b3ea8df035cba91d92eb4103480af1f41 (patch)
treec41aa6aeb0c6ac1f93dba0b302520c4ca370ccc5
parent9112ab2bb3aa1c6872736de872b1f96f8d25d332 (diff)
Revert "hal-info: correction for enable/disable WLAN killswitch support : removed DEPENDS to avoid a circular dependency, added a config_query_option in CONFIGURE instead"
This reverts commit 76222f7353a77cefa5c524948310a028c4431efb. (cherry picked from commit 49b18996c7d413013bf6a328b07def5a9198444e)
-rwxr-xr-xutils/hal-info/CONFIGURE3
-rwxr-xr-xutils/hal-info/DEPENDS1
-rw-r--r--utils/hal-info/HISTORY4
3 files changed, 1 insertions, 7 deletions
diff --git a/utils/hal-info/CONFIGURE b/utils/hal-info/CONFIGURE
index ea8647d246..f96141413c 100755
--- a/utils/hal-info/CONFIGURE
+++ b/utils/hal-info/CONFIGURE
@@ -1,5 +1,2 @@
config_query_option HALINFO "include recall data?" n "--enable-recall" ""
config_query_option HALINFO "include video suspend data?" n "--enable-video" ""
-config_query_option HALINFO "enable WLAN killswitch support?" y \
- "--enable-killswitch-ipw-wlan" \
- "--disable-killswitch-ipw-wlan"
diff --git a/utils/hal-info/DEPENDS b/utils/hal-info/DEPENDS
new file mode 100755
index 0000000000..60941eef76
--- /dev/null
+++ b/utils/hal-info/DEPENDS
@@ -0,0 +1 @@
+optional_depends hal "--enable-killswitch-ipw-wlan" "--disable-killswitch-ipw-wlan" "for WLAN killswitch support"
diff --git a/utils/hal-info/HISTORY b/utils/hal-info/HISTORY
index c63b4866db..29c52a2f81 100644
--- a/utils/hal-info/HISTORY
+++ b/utils/hal-info/HISTORY
@@ -1,7 +1,3 @@
-2007-10-31 Julien "_kaze_" ROZO <julien@rozo.org>
- * DEPENDS: removed, to avoid a circular dependency
- * CONFIGURE: instead of DEPENDS, added an option to enable WLAN killswitch support
-
2007-10-30 Julien "_kaze_" ROZO <julien@rozo.org>
* DEPENDS: added, optionally depends on hal for WLAN killswitch support