- only build the lib subdir in the standalone build

- corrent driver-detection order

2 files changed, 3 insertions, 2 deletions

diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp
index e287b47..59c2a61 100644
--- a/noncore/net/wellenreiter/gui/configwindow.cpp
+++ b/noncore/net/wellenreiter/gui/configwindow.cpp
@@ -1,100 +1,100 @@
 /**********************************************************************
 ** Copyright (C) 2002 Michael 'Mickey' Lauer.  All rights reserved.
 **
 ** This file is part of Opie Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 /* LOCAL */
 #include "configwindow.h"
 
 /* QT */
 #include <qcombobox.h>
 #include <qfile.h>
 #include <qlayout.h>
 #include <qmap.h>
 #include <qpushbutton.h>
 #include <qspinbox.h>
 #include <qtextstream.h>
 
 /* OPIE */
 #include <opie2/onetwork.h>
 
 WellenreiterConfigWindow* WellenreiterConfigWindow::_instance = 0;
 
 WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char * name, WFlags f )
            :WellenreiterConfigBase( parent, name, true, f )
 {
     _devicetype[ "cisco" ] = 1;
     _devicetype[ "wlan-ng" ] = 2;
     _devicetype[ "hostap" ] = 3;
     _devicetype[ "orinoco" ] = 4;
     _devicetype[ "<manual>" ] = 5;
 
     // gather possible interface names from ONetwork
     ONetwork* net = ONetwork::instance();
     ONetwork::InterfaceIterator it = net->iterator();
     while ( it.current() )
     {
         if ( it.current()->isWireless() )
             interfaceName->insertItem( it.current()->name() );
         ++it;
     }
 
     // try to guess device type
     QFile m( "/proc/modules" );
     if ( m.open( IO_ReadOnly ) )
     {
         int devicetype(0);
         QString line;
         QTextStream modules( &m );
         while( !modules.atEnd() && !devicetype )
         {
             modules >> line;
             if ( line.contains( "cisco" ) ) devicetype = 1;
-            else if ( line.contains( "wlan" ) ) devicetype = 2;
             else if ( line.contains( "hostap" ) ) devicetype = 3;
+            else if ( line.contains( "prism" ) ) devicetype = 2;
             else if ( line.contains( "orinoco" ) ) devicetype = 4;
         }
         if ( devicetype )
         {
             deviceType->setCurrentItem( devicetype );
             qDebug( "Wellenreiter: guessed device type to be %d", devicetype );
         }
     }
 
     #ifdef Q_WS_X11 // We're on X11: adding an Ok-Button for the Dialog here
     QPushButton* okButton = new QPushButton( "ok", this );
     okButton->show();
     Layout5_2->addWidget( okButton ); //FIXME: rename this in configbase.ui
     connect( okButton, SIGNAL( clicked() ), this, SLOT( accept() ) );
     #endif
 
     WellenreiterConfigWindow::_instance = this;
 };
 
 int WellenreiterConfigWindow::daemonDeviceType()
 {
     QString name = deviceType->currentText();
     if ( _devicetype.contains( name ) )
     {
         return _devicetype[name];
     }
     else
     {
         return 0;
     }
 };
 
 int WellenreiterConfigWindow::daemonHopInterval()
 {
     return hopInterval->cleanText().toInt();
 }
diff --git a/noncore/net/wellenreiter/wellenreiter.pro b/noncore/net/wellenreiter/wellenreiter.pro
index 6fe49c3..eb60c4a 100644
--- a/noncore/net/wellenreiter/wellenreiter.pro
+++ b/noncore/net/wellenreiter/wellenreiter.pro
@@ -1,13 +1,14 @@
 TEMPLATE        = subdirs
-unix:SUBDIRS    = lib gui
 
 !contains( platform, x11 ) {
   message( Configuring Wellenreiter for build on Opie )
+  SUBDIRS = gui
   include ( $(OPIEDIR)/include.pro )
 }
 
 contains( platform, x11 ) {
   message( Configuring Wellenreiter for build on Qt/X11 )
+  SUBDIRS = lib gui
   system( mkdir -p $OPIEDIR/lib $OPIEDIR/bin $OPIEDIR/share/pics )
 }