From 5df13d7b2acd41c54bed6253afac827bc864ea5a Mon Sep 17 00:00:00 2001
From: mickeyl <mickeyl>
Date: Fri, 26 Mar 2004 17:36:46 +0000
Subject: conditionally link against -lopiedb, i.e. only when ENABLE_SQL_PIM_BACKEND=y

---
diff --git a/Rules.make b/Rules.make
index 1db17ee..8cacfb0 100644
--- a/Rules.make
+++ b/Rules.make
@@ -29,7 +29,12 @@ else
 	echo CONFIG -= quick-app >> $@
 	echo CONFIG += quick-app-bin >> $@
 	echo \} >> $@
-endif	
+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 >> $@
 endif
diff --git a/include.pro b/include.pro
index c0019b0..c19e2f0 100644
--- a/include.pro
+++ b/include.pro
@@ -110,7 +110,7 @@ QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib
 # on linux. Therefore I remove the "plugin" term, which is needed by MacOS-X
 CONFIG -= plugin
 }
-QMAKE_LIBDIR += $(OPIEDIR)/lib
+LIBS += -L$(OPIEDIR)/lib
 
 MOC_DIR=.moc/$(PLATFORM)
 OBJECTS_DIR=.obj/$(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
@@ -8,15 +8,18 @@ SOURCES     = opimcontact.cpp opimcontactfields.cpp opimrecord.cpp opimtodo.cpp
               opimnotifymanager.cpp opimevent.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 )
 include ( core/backends/backends.pro )
 include ( ui/ui.pro )
 
+contains( ENABLE_SQL_PIM_BACKEND, y )
+  LIBS += -lopiedb2
+
 !contains( platform, x11 ) {
   include ( $(OPIEDIR)/include.pro )
 }
--
cgit v0.9.0.2