Rearranged linking

4 files changed, 10 insertions, 4 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 369c7a0..56b3fb0 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1328,5 +1328,6 @@ void CalendarView::syncSharp()
 
-#include <kabc/stdaddressbook.h>
+//#include <kabc/stdaddressbook.h>
 bool CalendarView::importBday()
 {
+#if 0
     KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true );
@@ -1371,2 +1372,3 @@ bool CalendarView::importBday()
     topLevelWidget()->setCaption(QString::number( addCount )+ i18n(" birthdays/anniversaries added!"));
+#endif
     return true;
diff --git a/korganizer/incomingdialog.cpp b/korganizer/incomingdialog.cpp
index f3bd09f..50e3077 100644
--- a/korganizer/incomingdialog.cpp
+++ b/korganizer/incomingdialog.cpp
@@ -52,3 +52,4 @@
 #ifndef KORG_NOKABC
-#include <kabc/stdaddressbook.h>
+#define KORG_NOKABC
+//#include <kabc/stdaddressbook.h>
 #define size count
diff --git a/korganizer/korganizerE.pro b/korganizer/korganizerE.pro
index 4247838..d841193 100644
--- a/korganizer/korganizerE.pro
+++ b/korganizer/korganizerE.pro
@@ -17,3 +17,3 @@ LIBS += -lmicrokde
 LIBS += -lmicroqtcompat
-LIBS += -lmicrokabc
+#LIBS += -lmicrokabc
 
@@ -23,2 +23,4 @@ LIBS += -lmicrokabc
 #LIBS += -lsdp
+LIBS += $(GCC3EXTRALIB1)
+LIBS += $(GCC3EXTRALIB2)
 
diff --git a/korganizer/publishdialog.cpp b/korganizer/publishdialog.cpp
index 4323b91..2ae6720 100644
--- a/korganizer/publishdialog.cpp
+++ b/korganizer/publishdialog.cpp
@@ -29,3 +29,4 @@
 #ifndef KORG_NOKABC
-#include <kabc/addresseedialog.h>
+#define KORG_NOKABC
+//#include <kabc/addresseedialog.h>
 #endif