| author | mickeyl <mickeyl> | 2004-04-06 12:06:40 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2004-04-06 12:06:40 (UTC) |
| commit | c76e3909e30af84830c0269b68f60d727717f2f9 (patch) (side-by-side diff) | |
| tree | 0d3bf559d3493d424f7d202227756111c67ec8f1 | |
| parent | 74c9cbe70b2a2530aad5e5a3cc8e0c946c560e95 (diff) | |
| download | opie-c76e3909e30af84830c0269b68f60d727717f2f9.zip opie-c76e3909e30af84830c0269b68f60d727717f2f9.tar.gz opie-c76e3909e30af84830c0269b68f60d727717f2f9.tar.bz2 | |
- improve config.ins
- fix dependencies for mailapplet
- improve MACOS_X test. No need to formulate it so complicated ;)
| -rw-r--r-- | noncore/net/mail/config.in | 6 | ||||
| -rw-r--r-- | noncore/net/mail/libmailwrapper/config.in | 2 | ||||
| -rw-r--r-- | noncore/net/mail/libmailwrapper/libmailwrapper.pro | 11 | ||||
| -rw-r--r-- | noncore/net/mail/taskbarapplet/config.in | 6 |
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 @@ -38,17 +38,14 @@ 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 ) |