author | mickeyl <mickeyl> | 2004-04-06 12:06:40 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-04-06 12:06:40 (UTC) |
commit | c76e3909e30af84830c0269b68f60d727717f2f9 (patch) (unidiff) | |
tree | 0d3bf559d3493d424f7d202227756111c67ec8f1 /noncore | |
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 | 4 |
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 @@ | |||
1 | source noncore/net/mail/libmailwrapper/config.in | 1 | source noncore/net/mail/libmailwrapper/config.in |
2 | |||
2 | config MAIL3 | 3 | config MAIL3 |
3 | boolean "opie-mail3 (a mail client)" | 4 | boolean "opie-mail3 (a mail client)" |
4 | default "y" | 5 | default "y" |
5 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2PIM && LIBOPIE2DB && LIBMAILWRAPPER | 6 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2PIM && LIBOPIE2DB && LIBMAILWRAPPER |
7 | comment "opie-mail3 needs a libqpe, libopie2core, libopie2pim, libopie2db and the libmailwrapper" | ||
8 | depends ! ( ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2PIM && LIBOPIE2DB && LIBMAILWRAPPER ) | ||
9 | |||
6 | source noncore/net/mail/taskbarapplet/config.in | 10 | 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 @@ | |||
1 | config LIBMAILWRAPPER | 1 | config LIBMAILWRAPPER |
2 | boolean "libmailwrapper ( wrapper arround libetpan needed by mail3" | 2 | boolean "libmailwrapper (libetpan wrapper library)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) | 4 | 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 \ | |||
38 | INTERFACES = logindialogui.ui \ | 38 | INTERFACES = logindialogui.ui \ |
39 | sendmailprogressui.ui | 39 | sendmailprogressui.ui |
40 | 40 | ||
41 | |||
42 | INCLUDEPATH += $(OPIEDIR)/include | 41 | INCLUDEPATH += $(OPIEDIR)/include |
43 | |||
44 | CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) | ||
45 | contains( CONFTEST, y ){ | ||
46 | LIBS += -lqpe -letpan -lssl -lcrypto -liconv | ||
47 | }else{ | ||
48 | LIBS += -lqpe -letpan -lssl -lcrypto | 42 | LIBS += -lqpe -letpan -lssl -lcrypto |
43 | |||
44 | contains( $(CONFIG_TARGET_MACOSX), y ){ | ||
45 | LIBS += -liconv | ||
49 | } | 46 | } |
50 | 47 | ||
51 | DESTDIR = $(OPIEDIR)/lib$(PROJMAK) | 48 | DESTDIR = $(OPIEDIR)/lib |
52 | TARGET = mailwrapper | 49 | TARGET = mailwrapper |
53 | 50 | ||
54 | include ( $(OPIEDIR)/include.pro ) | 51 | 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 @@ | |||
1 | config MAILAPPLET | 1 | config MAILAPPLET |
2 | boolean "mailapplet ( taskbar mail applet )" | 2 | boolean "mailapplet ( taskbar mail applet )" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && MAIL3 | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBMAILWRAPPER |
5 | comment "mailapplet needs a libqpe, libopie2core and the libmailwrapper" | ||
6 | depends !( ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBMAILWRAPPER ) | ||