3 files changed, 11 insertions, 3 deletions

diff --git a/Rules.make b/Rules.make
index 1db17ee..8cacfb0 100644
--- a/Rules.make
+++ b/Rules.make
@@ -31,4 +31,9 @@ else
         echo \} >> $@
         endif
+ifeq ($(CONFIG_SQL_PIM_BACKEND),y)
+        echo ENABLE_SQL_PIM_BACKEND=$(CONFIG_SQL_PIM_BACKEND) >> $@
+else
+        echo ENABLE_SQL_PIM_BACKEND=n >> $@
+endif
 ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y)
         echo CONFIG += no-override >> $@
diff --git a/include.pro b/include.pro
index c0019b0..c19e2f0 100644
--- a/include.pro
+++ b/include.pro
@@ -111,5 +111,5 @@ QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib
 CONFIG -= plugin
 }
-QMAKE_LIBDIR += $(OPIEDIR)/lib
+LIBS += -L$(OPIEDIR)/lib
 
 MOC_DIR=.moc/$(PLATFORM)
diff --git a/libopie2/opiepim/opiepim.pro b/libopie2/opiepim/opiepim.pro
index b341819..c328315 100644
--- a/libopie2/opiepim/opiepim.pro
+++ b/libopie2/opiepim/opiepim.pro
@@ -9,8 +9,8 @@ SOURCES     = opimcontact.cpp opimcontactfields.cpp opimrecord.cpp opimtodo.cpp
 INTERFACES  =
 TARGET      = opiepim2
-VERSION     = 1.8.3
+VERSION     = 1.8.4
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS        += -lopiecore2 -lopiedb2
+LIBS        += -lopiecore2
 
 include ( core/core.pro )
@@ -18,4 +18,7 @@ include ( core/backends/backends.pro )
 include ( ui/ui.pro )
 
+contains( ENABLE_SQL_PIM_BACKEND, y )
+  LIBS += -lopiedb2
+
 !contains( platform, x11 ) {
   include ( $(OPIEDIR)/include.pro )