4 files changed, 14 insertions, 11 deletions

diff --git a/noncore/net/mail/config.in b/noncore/net/mail/config.in
index 5ad11eb..a289eb4 100644
--- a/noncore/net/mail/config.in
+++ b/noncore/net/mail/config.in
@@ -1,6 +1,10 @@
 source noncore/net/mail/libmailwrapper/config.in
+
 config MAIL3
     boolean "opie-mail3 (a mail client)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2PIM && LIBOPIE2DB && LIBMAILWRAPPER
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2PIM && LIBOPIE2DB && LIBMAILWRAPPER
+    comment "opie-mail3 needs a libqpe, libopie2core, libopie2pim, libopie2db and the libmailwrapper"
+    depends ! ( ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2PIM && LIBOPIE2DB && LIBMAILWRAPPER )
+
 source noncore/net/mail/taskbarapplet/config.in
diff --git a/noncore/net/mail/libmailwrapper/config.in b/noncore/net/mail/libmailwrapper/config.in
index 8207975..7d3d1dd 100644
--- a/noncore/net/mail/libmailwrapper/config.in
+++ b/noncore/net/mail/libmailwrapper/config.in
@@ -1,4 +1,4 @@
  config LIBMAILWRAPPER
-    boolean "libmailwrapper ( wrapper arround libetpan needed by mail3"
+    boolean "libmailwrapper (libetpan wrapper library)"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 )
diff --git a/noncore/net/mail/libmailwrapper/libmailwrapper.pro b/noncore/net/mail/libmailwrapper/libmailwrapper.pro
index d220216..6ab0bf8 100644
--- a/noncore/net/mail/libmailwrapper/libmailwrapper.pro
+++ b/noncore/net/mail/libmailwrapper/libmailwrapper.pro
@@ -37,18 +37,15 @@ SOURCES         = imapwrapper.cpp \
 
 INTERFACES     = logindialogui.ui \
               sendmailprogressui.ui
 
-
 INCLUDEPATH += $(OPIEDIR)/include
+LIBS        += -lqpe -letpan -lssl -lcrypto
 
-CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX )
-contains( CONFTEST, y ){
-    LIBS        += -lqpe -letpan -lssl -lcrypto -liconv
-}else{
-    LIBS        += -lqpe -letpan -lssl -lcrypto
+contains( $(CONFIG_TARGET_MACOSX), y ){
+    LIBS    += -liconv
 }
 
-DESTDIR         = $(OPIEDIR)/lib$(PROJMAK)
+DESTDIR      = $(OPIEDIR)/lib
 TARGET       = mailwrapper
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/mail/taskbarapplet/config.in b/noncore/net/mail/taskbarapplet/config.in
index f01c81b..035d1d0 100644
--- a/noncore/net/mail/taskbarapplet/config.in
+++ b/noncore/net/mail/taskbarapplet/config.in
@@ -1,4 +1,6 @@
  config MAILAPPLET
-    boolean "mailapplet ( taskbar mail applet )"
+    boolean "mailapplet (taskbar mail applet)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && MAIL3
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBMAILWRAPPER
+    comment "mailapplet needs a libqpe, libopie2core and the libmailwrapper"
+    depends !( ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBMAILWRAPPER )