3 files changed, 7 insertions, 6 deletions

diff --git a/noncore/unsupported/mail2/config.in b/noncore/unsupported/mail2/config.in
index b584be3..af0fa3c 100644
--- a/noncore/unsupported/mail2/config.in
+++ b/noncore/unsupported/mail2/config.in
@@ -1,12 +1,13 @@
   config OPIEMAIL2
     boolean "opiemail"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && BEND && LIBMAIL
 
   config MAIL
     boolean
     default "y" if OPIEMAIL
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && BEND && LIBMAIL
-    
+
+
   source noncore/mail/bend/config.in
   source noncore/mail/libmail/config.in
diff --git a/noncore/unsupported/mail2/libmail/libmail.pro b/noncore/unsupported/mail2/libmail/libmail.pro
index 05a9773..5f8e590 100644
--- a/noncore/unsupported/mail2/libmail/libmail.pro
+++ b/noncore/unsupported/mail2/libmail/libmail.pro
@@ -1,45 +1,45 @@
         TEMPLATE        =lib
-        CONFIG          =qt warn_on debug
-        #CONFIG                 =qt warn_on release
+        CONFIG          +=qt warn_on debug
+        #CONFIG                 +=qt warn_on release
         HEADERS                 =configfile.h \
                         defines.h \
                         imapbase.h \
                         imaphandler.h \
                         imapresponse.h \
                         mailfactory.h \
                         md5.cpp \
                         miscfunctions.h \
                         smtphandler.h
         SOURCES                 =configfile.cpp \
                         imapbase.cpp \
                         imaphandler.cpp \
                         imapresponse.cpp \
                         mailfactory.cpp \
                         md5.h \
                         miscfunctions.cpp \
                         smtphandler.cpp
         INCLUDEPATH     +=$(OPIEDIR)/include
         LIBS            +=-L$(OPIEDIR)/lib -lqpe
         TARGET          =mail
 DESTDIR      = $(OPIEDIR)/lib
 
 TRANSLATIONS = ../../../i18n/de/libmail.ts \
          ../../../i18n/da/libmail.ts \
          ../../../i18n/xx/libmail.ts \
          ../../../i18n/en/libmail.ts \
          ../../../i18n/es/libmail.ts \
          ../../../i18n/fr/libmail.ts \
          ../../../i18n/hu/libmail.ts \
          ../../../i18n/ja/libmail.ts \
          ../../../i18n/ko/libmail.ts \
          ../../../i18n/no/libmail.ts \
          ../../../i18n/pl/libmail.ts \
          ../../../i18n/pt/libmail.ts \
          ../../../i18n/pt_BR/libmail.ts \
          ../../../i18n/sl/libmail.ts \
          ../../../i18n/zh_CN/libmail.ts \
          ../../../i18n/zh_TW/libmail.ts
 
 
 
 include ( ../../../include.pro )
diff --git a/noncore/unsupported/mail2/mail.pro b/noncore/unsupported/mail2/mail.pro
index 407545f..faaec9c 100644
--- a/noncore/unsupported/mail2/mail.pro
+++ b/noncore/unsupported/mail2/mail.pro
@@ -1,67 +1,67 @@
         TEMPLATE        = app
-        CONFIG          = qt warn_on debug
-        #CONFIG                 = qt warn_on release
+        CONFIG          += qt warn_on debug
+        #CONFIG                 += qt warn_on release
         HEADERS                 = accounteditor.h \
                           addresspicker.h \
                           composer.h \
                           composerbase.h \
                           configdiag.h \
                           folderwidget.h \
                           listviewplus.h \
                         mailstatusbar.h \
                           mailtable.h \
                           mainwindow.h \
                           mainwindowbase.h \
                           opendiag.h \
                           rename.h \
                           searchdiag.h \
                           viewmail.h \
                           viewmailbase.h
         SOURCES                 = accounteditor.cpp \
                           addresspicker.cpp \
                           composer.cpp \
                           composerbase.cpp \
                           configdiag.cpp \
                           folderwidget.cpp \
                           listviewplus.cpp \
                         mailstatusbar.cpp \
                           mailtable.cpp \
                           main.cpp \
                           mainwindow.cpp \
                           mainwindowbase.cpp \
                           opendiag.cpp \
                           rename.cpp \
                           searchdiag.cpp \
                           viewmail.cpp \
                           viewmailbase.cpp
         INTERFACES      = accounteditorbase.ui \
                           addresspickerbase.ui \
                           configdiagbase.ui \
                           opendiagbase.ui \
                           renamebase.ui \
                           searchdiagbase.ui
         INCLUDEPATH    += $(OPIEDIR)/include libmail
         LIBS           += -lmail -lqpe -lopie
         TARGET          = mail 
         DESTDIR                 = $(OPIEDIR)/bin
 
 TRANSLATIONS = ../../i18n/de/mail.ts \
          ../../i18n/da/mail.ts \
          ../../i18n/xx/mail.ts \
          ../../i18n/en/mail.ts \
          ../../i18n/es/mail.ts \
          ../../i18n/fr/mail.ts \
          ../../i18n/hu/mail.ts \
          ../../i18n/ja/mail.ts \
          ../../i18n/ko/mail.ts \
          ../../i18n/no/mail.ts \
          ../../i18n/pl/mail.ts \
          ../../i18n/pt/mail.ts \
          ../../i18n/pt_BR/mail.ts \
          ../../i18n/sl/mail.ts \
          ../../i18n/zh_CN/mail.ts \
          ../../i18n/zh_TW/mail.ts
 
 
 
 include ( ../../include.pro )