- improve config.ins

- fix dependencies for mailapplet
- improve MACOS_X test. No need to formulate it so complicated ;)

4 files changed, 13 insertions, 10 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
@@ -17,38 +17,35 @@ HEADERS         = mailwrapper.h \
                nntpwrapper.h \
                generatemail.h \
                storemail.h
 
 SOURCES         = imapwrapper.cpp \
                mailwrapper.cpp \
                mailtypes.cpp \
                pop3wrapper.cpp \
                abstractmail.cpp \
                smtpwrapper.cpp \
                genericwrapper.cpp \
                mboxwrapper.cpp \
                settings.cpp \
                logindialog.cpp \
                sendmailprogress.cpp \
                statusmail.cpp \
                mhwrapper.cpp \
               nntpwrapper.cpp \
               generatemail.cpp \
               storemail.cpp
 
 INTERFACES     = logindialogui.ui \
               sendmailprogressui.ui
 
-
 INCLUDEPATH += $(OPIEDIR)/include
-
-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 )"
     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 )