10 files changed, 25 insertions, 15 deletions

diff --git a/core/pim/addressbook/addressbook.pro b/core/pim/addressbook/addressbook.pro
index 8bf19f5..b27e4b8 100644
--- a/core/pim/addressbook/addressbook.pro
+++ b/core/pim/addressbook/addressbook.pro
@@ -1,28 +1,28 @@
         #CONFIG         = qt warn_on  quick-app
         CONFIG  = qt warn_on   quick-app
         HEADERS= addressbook.h \
                   contacteditor.h \
                   ablabel.h \
                   abtable.h \
                   picker.h \
                   ofloatbar.h \
                   configdlg.h \
                   abconfig.h \
                   abview.h
         SOURCES= main.cpp \
                   addressbook.cpp \
                   contacteditor.cpp \
                   ablabel.cpp \
                   abtable.cpp \
                   picker.cpp \
                   configdlg.cpp \
                   abconfig.cpp \
                   abview.cpp
 
         INTERFACES= configdlg_base.ui
         TARGET  = addressbook
 INCLUDEPATH += $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
-LIBS            += -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lopiedb2
+LIBS            += -lqpe -lopiecore2 -lopieui2 -lopiepim2
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/core/pim/addressbook/config.in b/core/pim/addressbook/config.in
index 7ecf14c..ab16fef 100644
--- a/core/pim/addressbook/config.in
+++ b/core/pim/addressbook/config.in
@@ -1,4 +1,4 @@
   config ADDRESSBOOK
     boolean "opie-addressbook (a simple addressbook)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBOPIE2DB
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM
diff --git a/core/pim/datebook/datebook.pro b/core/pim/datebook/datebook.pro
index 8fbc1ca..bf9a2cc 100644
--- a/core/pim/datebook/datebook.pro
+++ b/core/pim/datebook/datebook.pro
@@ -6,36 +6,36 @@ HEADERS	= datebookday.h \
           datebooksettings.h \
           datebookweek.h \
           datebookweeklst.h \
           datebookweekheaderimpl.h \
           repeatentry.h \
           noteentryimpl.h \
           onoteedit.h \
           datebookdayallday.h  \
           namespace_hack.h 
         SOURCES= main.cpp \
           datebookday.cpp \
           datebook.cpp \
           dateentryimpl.cpp \
           datebookdayheaderimpl.cpp \
           datebooksettings.cpp \
           datebookweek.cpp \
           datebookweeklst.cpp \
           datebookweekheaderimpl.cpp \
           repeatentry.cpp \
           noteentryimpl.cpp \
           onoteedit.cpp \
           datebookdayallday.cpp 
         INTERFACES= dateentry.ui \
                   datebookdayheader.ui \
                   datebookweekheader.ui \
                           datebookweeklstheader.ui \      
                           datebookweeklstdayhdr.ui \      
                   repeatentrybase.ui \
                   datebooksettingsbase.ui \
                   noteentry.ui
 INCLUDEPATH += $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
-LIBS            += -lqpe -lopieui2
+LIBS            += -lqpe -lopieui2 -lopiecore2
         TARGET  = datebook
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/core/pim/today/plugins/addressbook/addressbook.pro b/core/pim/today/plugins/addressbook/addressbook.pro
index 7804297..3877fad 100644
--- a/core/pim/today/plugins/addressbook/addressbook.pro
+++ b/core/pim/today/plugins/addressbook/addressbook.pro
@@ -1,21 +1,21 @@
 TEMPLATE = lib
 CONFIG -= moc
 CONFIG += qt plugin 
 
 # Input
 HEADERS = addressplugin.h addresspluginimpl.h addresspluginconfig.h  \
     addresspluginwidget.h
 SOURCES = addressplugin.cpp addresspluginimpl.cpp addresspluginconfig.cpp \
     addresspluginwidget.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include \
         ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
         ../ ../library
 
-LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lopiedb2 -lqtaux2
+LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lqtaux2
 
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todayaddressbookplugin
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/core/pim/today/plugins/addressbook/config.in b/core/pim/today/plugins/addressbook/config.in
index 33e8b6d..c212064 100644
--- a/core/pim/today/plugins/addressbook/config.in
+++ b/core/pim/today/plugins/addressbook/config.in
@@ -1,7 +1,7 @@
   config TODAY_ADDRESSBOOK
     boolean "opie-today-addressbookplugin (shows Birthdays and Anniversaries)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBOPIE2DB && LIBQTAUX
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBQTAUX
 
     comment "opie-today-addressbookplugin requires libopie2core, libopie2ui, libopie2pim, libopie2db and libqtaux"
-    depends !( ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBOPIE2DB && LIBQTAUX )
+    depends !( ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBQTAUX )
diff --git a/core/pim/todo/config.in b/core/pim/todo/config.in
index 6904174..45c4558 100644
--- a/core/pim/todo/config.in
+++ b/core/pim/todo/config.in
@@ -1,4 +1,4 @@
   config TODO
     boolean "opie-todo (a Todo-list manager)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBOPIE2DB
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM
diff --git a/core/pim/todo/todo.pro b/core/pim/todo/todo.pro
index 1271d2d..eea5db7 100644
--- a/core/pim/todo/todo.pro
+++ b/core/pim/todo/todo.pro
@@ -15,35 +15,35 @@ HEADERS	= smalltodo.h \
           templatedialog.h \
           templatedialogimpl.h \
           quickedit.h \
           quickeditimpl.h \
           otaskeditor.h \
           taskeditoroverview.h \
           taskeditorstatus.h \
           taskeditoralarms.h
 
         SOURCES= smalltodo.cpp \
           todomanager.cpp \
           mainwindow.cpp \
         #  main.cpp \
           tableview.cpp \
           todoview.cpp \
           todotemplatemanager.cpp \
           todoeditor.cpp   \
           todoshow.cpp \
           textviewshow.cpp \
           templateeditor.cpp \
           templatedialog.cpp  \
           templatedialogimpl.cpp \
           quickeditimpl.cpp \
           quickedit.cpp \
           otaskeditor.cpp \
           taskeditoroverview.cpp \
           taskeditorstatus.cpp \
           taskeditoralarms.cpp
 
         TARGET  = todolist
 INCLUDEPATH += $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
-LIBS            += -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lopiedb2
+LIBS            += -lqpe -lopiecore2 -lopieui2 -lopiepim2
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/include.pro b/include.pro
index c19e2f0..ced5c9f 100644
--- a/include.pro
+++ b/include.pro
@@ -70,50 +70,59 @@ INSTALLS += apps
 sounds.path = $$prefix/sounds/$$TARGET
 sounds.files = sounds/*
 INSTALLS += sounds
 
 # anything in nonstandard paths
 root.path = /
 root.files = root/*
 INSTALLS += root
 
 # new targets
 opie-lupdate.target = opie-lupdate
 opie-lupdate.commands = opie-lupdate  $(PRO)
 
 opie-lrelease.target = opie-lrelease
 opie-lrelease.commands = opie-lrelease $(PRO)
 
 lupdate.target = lupdate
 lupdate.commands = lupdate -noobsolete $(PRO)
 
 lrelease.target = lrelease
 lrelease.commands = lrelease $(PRO)
 
 # new message target to get all strings from the apps with and without tr
 messages.target = messages
 messages.commands = xgettext -C -n -ktr -kQT_TRANSLATE_NOOP $$HEADERS $$SOURCES -o '$(OPIEDIR)/messages-$(QMAKE_TARGET)-tr.po' && xgettext -C -n -a $$HEADERS $$SOURCES -o '$(OPIEDIR)/messages-$(QMAKE_TARGET)-allstrings.po'
 
 ipk.target = ipk
 ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; )
 
 QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease messages
 CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX )
 contains( CONFTEST, y ){
-QMAKE_LFLAGS += -Wl
-LIBS -= -ldl
-LIBS -= -lcrypt 
-LIBS -= -lm
+  QMAKE_LFLAGS += -Wl
+  LIBS -= -ldl
+  LIBS -= -lcrypt 
+  LIBS -= -lm
+
+  # Manual including indirect referenced libraries which are not loaded
+  # by the mac-linker automatically
+  CONFTEST = $$system( echo $CONFIG_SQL_PIM_BACKEND )
+  contains( CONFTEST, y ){
+    LIBS += -lopiedb2 -lqpe
+  } else {
+    LIBS += -lqpe
+  }
 }
 else {
 QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib
 # I am not sure whether it is a good idea to change the way plugins is build
 # on linux. Therefore I remove the "plugin" term, which is needed by MacOS-X
 CONFIG -= plugin
 }
 LIBS += -L$(OPIEDIR)/lib
 
 MOC_DIR=.moc/$(PLATFORM)
 OBJECTS_DIR=.obj/$(PLATFORM)
 
 #was here now at thetop
 #include ( $(OPIEDIR)/gen.pro )
diff --git a/libopie2/opiepim/config.in b/libopie2/opiepim/config.in
index fb75fcc..2c920bb 100644
--- a/libopie2/opiepim/config.in
+++ b/libopie2/opiepim/config.in
@@ -1,21 +1,21 @@
   config LIBOPIE2PIM
     boolean "libopie2pim (pim related classes)"
     default "n"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2DB
-    comment "libopie2pim needs a libqpe and libopie2core and libopie2db"
-    depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2DB)
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
+    comment "libopie2pim needs a libqpe and libopie2core"
+    depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE )
 
   config SQL_PIM_BACKEND
     boolean "Enable SQL Backend for libopie2pim"
     default n
     help
         This adds the SQL-Support, using SQLite. Which database is used
         by the backends is defined by the file "pimaccess.conf" in the
         directory "Settings".
         There currently do exist to groups "[contact]" and "[todo]". You can
         select the used backend by the variable "usebackend=<type>", where
         <type> is "sql" or "xml". "xml" is the default !
         Important: The SQLite-library "libsqlite.so" must be installed !
     depends ( LIBOPIE2DB )
     comment "SQL-Support needs libopie2db (and libsqlite)"
     depends !( LIBOPIE2DB )
diff --git a/packages b/packages
index da2a9d9..a11e6a0 100644
--- a/packages
+++ b/packages
@@ -1,64 +1,65 @@
         CONFIG_ABOUTAPPLET      core/applets/aboutappletaboutapplet.pro
         CONFIG_ADDRESSBOOK      core/pim/addressbookaddressbook.pro
         CONFIG_ADVANCEDFM       noncore/apps/advancedfmadvancedfm.pro
         CONFIG_APPEARANCE2      noncore/settings/appearance2appearance2.pro
 CONFIG_APPLET_EXAMPLE   examples/applet example.pro
         CONFIG_APPSKEY  noncore/settings/appskeyappskey.pro
         CONFIG_AQPKG    noncore/settings/aqpkgaqpkg.pro
         CONFIG_AUTOROTATEAPPLET         noncore/applets/autorotateappletautorotateapplet.pro
         CONFIG_BACKGAMMONnoncore/games/backgammon backgammon.pro
         CONFIG_BACKUP   noncore/settings/backupbackup.pro
         CONFIG_BARTENDER noncore/apps/opie-bartenderbartender.pro
         CONFIG_BATTERYAPPLET    core/applets/batteryappletbatteryapplet.pro
         CONFIG_BEND     noncore/unsupported/mail2/bendbend.pro
 CONFIG_BIGSCREEN_EXAMPLE       libopie/big-screen/example      osplitter_mail.pro
         CONFIG_BINARY   noncore/tools/calc2/binarybinary.pro
         CONFIG_BLUE-PIN         noncore/net/opietooth/blue-pinblue-pin.pro
         CONFIG_BOUNCE   noncore/games/bouncebounce.pro
         CONFIG_BUTTON-SETTINGS  core/settings/buttonbutton.pro
         CONFIG_BUZZWORD         noncore/games/buzzwordbuzzword.pro
         CONFIG_CALC2    noncore/tools/calc2calc.pro
         CONFIG_CALCULATOR       noncore/tools/calculatorcalculator.pro
         CONFIG_CALIBRATE        core/apps/calibratecalibrate.pro
         CONFIG_CAMERA   noncore/multimedia/cameracamera.pro
         CONFIG_CARDMON  core/applets/cardmoncardmon.pro
         CONFIG_CHECKBOOK        noncore/apps/checkbookcheckbook.pro
         CONFIG_CITYTIME         core/settings/citytimecitytime.pro
         CONFIG_CLIPBOARDAPPLET  core/applets/clipboardappletclipboardapplet.pro
         CONFIG_CLOCKAPPLET      core/applets/clockappletclockapplet.pro
         CONFIG_CLOCK    noncore/tools/clockclock.pro
         CONFIG_CONFEDIT         noncore/apps/confeditconfedit.pro
         CONFIG_DASHER   inputmethods/dasherdasher.pro
         CONFIG_DATEBOOK         core/pim/datebookdatebook.pro
+        CONFIG_DATEBOOK2        core/pim/datebook2datebook2.pro
         CONFIG_DECO_FLAT        noncore/decorations/flatflat.pro
         CONFIG_DECO_LIQUID      noncore/decorations/liquidliquid.pro
         CONFIG_DECO_POLISHED    noncore/decorations/polishedpolished.pro
         CONFIG_DICTIONARY       noncore/apps/dictionarydictionary.pro
 CONFIG_DOCTAB  noncore/settings/doctab doctab.pro
         CONFIG_DRAWPAD  noncore/graphics/drawpaddrawpad.pro
         CONFIG_DVORAK   inputmethods/dvorakdvorak.pro
         CONFIG_EMBEDDEDKONSOLE  core/apps/embeddedkonsoleembeddedkonsole.pro
         CONFIG_EUROCONV         noncore/tools/euroconv/ euroconv.pro
 CONFIG_EXAMPLE_BOARD    examples/inputmethod    example.pro
 CONFIG_EXAMPLE_MENU     examples/menuapplet menuapplet.pro
 CONFIG_EXAMPLE_VPN      examples/networksettings        example.pro
         CONFIG_FIFTEEN  noncore/games/fifteenfifteen.pro
         CONFIG_FILEBROWSER      noncore/unsupported/filebrowserfilebrowser.pro
         CONFIG_FLAT     noncore/styles/flatflat.pro
         CONFIG_FORMATTER        noncore/tools/formatterformatter.pro
         CONFIG_FREETYPE         freetypefreetype.pro
         CONFIG_FRESH    noncore/styles/freshfresh.pro
         CONFIG_FTPLIB   noncore/net/ftplibftplib.pro
         CONFIG_GO       noncore/games/gogo.pro
         CONFIG_GSMTOOL  noncore/unsupported/gsmtoolgsmtool.pro
         CONFIG_HANDWRITING      inputmethods/handwritinghandwriting.pro
         CONFIG_HELPBROWSER      core/apps/helpbrowserhelpbrowser.pro
         CONFIG_HOMEAPPLET       core/applets/homeapplethomeapplet.pro
         CONFIG_INTERFACES       noncore/settings/networksettings/interfacesinterfaces.pro
         CONFIG_IRDAAPPLET       core/applets/irdaappletirdaapplet.pro
         CONFIG_JUMPX    inputmethods/jumpxjumpx.pro
         CONFIG_KBILL    noncore/games/kbillkbill.pro
         CONFIG_KCHECKERS        noncore/games/kcheckerskcheckers.pro
         CONFIG_KEYBOARD         inputmethods/keyboardkeyboard.pro
         CONFIG_KEYPEBBLE        noncore/comm/keypebblekeypebble.pro
         CONFIG_KEYVIEW  development/keyviewkeyview.pro