- remove optional SQL support from libopie1

- add optional SQL support to libopie2

3 files changed, 18 insertions, 24 deletions

diff --git a/libopie/libopie.pro b/libopie/libopie.pro
index 145743d..783c11d 100644
--- a/libopie/libopie.pro
+++ b/libopie/libopie.pro
@@ -1,3 +1,3 @@
 TEMPLATE        = lib
-CONFIG          += qte warn_on release
+CONFIG          += qte warn_on 
 HEADERS   = ofontmenu.h \
@@ -97,13 +97,2 @@ LIBS += -lqpe
 
-# Add SQL-Support if selected by config (eilers) 
-CONFTEST = $$system( echo $CONFIG_SQL_PIM_BACKEND )
-contains( CONFTEST, y ){
-
-DEFINES += __USE_SQL
-LIBS    += -lopiedb2
-HEADERS += pim/otodoaccesssql.h pim/ocontactaccessbackend_sql.h pim/odatebookaccessbackend_sql.h
-SOURCES += pim/otodoaccesssql.cpp pim/ocontactaccessbackend_sql.cpp pim/odatebookaccessbackend_sql.cpp
-
-}
-
 INTERFACES      = otimepickerbase.ui orecurrancebase.ui
diff --git a/libopie2/opiepim/backend/backends.pro b/libopie2/opiepim/backend/backends.pro
index 953d928..7049aab 100644
--- a/libopie2/opiepim/backend/backends.pro
+++ b/libopie2/opiepim/backend/backends.pro
@@ -1,2 +1,2 @@
-SOURCES += core/backends/ocontactaccessbackend_sql.cpp \
+SOURCES += \
         core/backends/ocontactaccessbackend_vcard.cpp \
@@ -11,8 +11,7 @@ SOURCES += core/backends/ocontactaccessbackend_sql.cpp \
         core/backends/otodoaccessxml.cpp \
-        core/backends/odatebookaccess.cpp \
-        core/backends/odatebookaccessbackend_sql.cpp 
+        core/backends/odatebookaccess.cpp
         
-HEADERS += core/backends/obackendfactory.h \
+HEADERS += \
+        core/backends/obackendfactory.h \
         core/backends/ocontactaccessbackend.h \
-        core/backends/ocontactaccessbackend_sql.h \
         core/backends/ocontactaccessbackend_vcard.h \
@@ -21,3 +20,2 @@ HEADERS += core/backends/obackendfactory.h \
         core/backends/odatebookaccessbackend.h \
-        core/backends/odatebookaccessbackend_sql.h \
         core/backends/odatebookaccessbackend_xml.h \
@@ -27,3 +25,2 @@ HEADERS += core/backends/obackendfactory.h \
         core/backends/otodoaccess.h \
-        core/backends/otodoaccesssql.h \
         core/backends/otodoaccessvcal.h \
@@ -31 +28,12 @@ HEADERS += core/backends/obackendfactory.h \
         core/backends/odatebookaccess.h 
+
+contains( ENABLE_SQL_PIM_BACKEND, y ) {
+        DEFINES += __USE_SQL
+        LIBS    += -lopiedb2
+        HEADERS += core/backends/otodoaccesssql.h \
+                   core/backends/ocontactaccessbackend_sql.h \
+                   core/backends/odatebookaccessbackend_sql.h
+        SOURCES += core/backends/otodoaccesssql.cpp \
+                   core/backends/ocontactaccessbackend_sql.cpp \
+                   core/backends/odatebookaccessbackend_sql.cpp
+}
diff --git a/libopie2/opiepim/opiepim.pro b/libopie2/opiepim/opiepim.pro
index c328315..416765e 100644
--- a/libopie2/opiepim/opiepim.pro
+++ b/libopie2/opiepim/opiepim.pro
@@ -1,3 +1,3 @@
 TEMPLATE    = lib
-CONFIG      += qt warn_on debug
+CONFIG      += qt warn_on 
 DESTDIR     = $(OPIEDIR)/lib
@@ -10,3 +10,3 @@ INTERFACES  =
 TARGET      = opiepim2
-VERSION     = 1.8.4
+VERSION     = 1.8.5
 INCLUDEPATH += $(OPIEDIR)/include
@@ -19,5 +19,2 @@ include ( ui/ui.pro )
 
-contains( ENABLE_SQL_PIM_BACKEND, y )
-  LIBS += -lopiedb2
-
 !contains( platform, x11 ) {