specifying the wireless extension version is now optional thanks

to libopienet2 gathering the WE version automatically
you can still override it if needed

2 files changed, 7 insertions, 0 deletions

diff --git a/Rules.make b/Rules.make
index 3f494ce..94a79e7 100644
--- a/Rules.make
+++ b/Rules.make
@@ -67,13 +67,15 @@ ifeq ($(CONFIG_OPIE_NEW_ALLOC),y)
         echo DEFINES += OPIE_NEW_MALLOC >> $@
 endif
 ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y)
         echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@
 endif
         echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@
+ifeq ($(CONFIG_OPIE_WE_VERSION_OVERRIDE),y)
         echo DEFINES += OPIE_WE_VERSION=$(CONFIG_OPIE_WE_VERSION) >> $@
+endif
 $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages
         @echo Generating dependency information...
 # add to subdir-y, and add descend rules
         @cat $(TOPDIR)/packages | grep -v '^#' | \
                 awk '{print \
                         ".PHONY : " $$2 "\n" \
diff --git a/config.in b/config.in
index 0b01f78..7ad5e51 100644
--- a/config.in
+++ b/config.in
@@ -137,13 +137,18 @@ config OPIE_NEW_ALLOC
 
 config OPIE_NO_SOUND_PCM_READ_BITS
   boolean "There is not a pcm_read_bits io control"
   default y if TARGET_SHARP
   default n
 
+config OPIE_WE_VERSION_OVERRIDE
+  boolean "Override autodetection of wireless extension (WE) version
+  default n
+
 config OPIE_WE_VERSION
+  depends OPIE_WE_VERSION_OVERRIDE
   string  "The wireless extension (WE) version to build against"
   default "15" if ! TARGET_X86
   default "16" if TARGET_X86
 
 endmenu