4 files changed, 21 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 0b8997e..6a8521f 100644
--- a/Makefile
+++ b/Makefile
@@ -76,9 +76,13 @@ build_microkde: variable_test tmake
           done
 
 build_qtopia_plugin: build_microkde
+  ifdef BUILD_NO_QTOPIA_PLUGIN
+        @echo == qtopia plugin not build.
+  else
         for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
+  endif
 
 build_opie_plugin: build_microkde
   ifdef BUILD_NO_OPIE_PLUGIN
@@ -88,7 +92,7 @@ build_opie_plugin: build_microkde
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
   endif
-  
+
 build_sharp_plugin: build_microkde
   ifdef BUILD_NO_SHARP_PLUGIN
         @echo == ldap plugin not build.
@@ -148,6 +152,7 @@ variable_info:
         @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
         @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN)
         @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN)
+        @echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN)
         @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN)
         ifndef BUILD_NO_SHARP_PLUGIN
         @echo SHARPDTMSDK=$(SHARPDTMSDK)
@@ -172,6 +177,9 @@ variable_test: variable_info
   ifdef BUILD_NO_OPIE_PLUGIN
         @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
   endif
+  ifdef BUILD_NO_QTOPIA_PLUGIN
+        @echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN)
+  endif
   ifdef BUILD_NO_MICROMAIL
         @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
   endif
diff --git a/Makefile.Embedded b/Makefile.Embedded
index 0b8997e..6a8521f 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -76,9 +76,13 @@ build_microkde: variable_test tmake
           done
 
 build_qtopia_plugin: build_microkde
+  ifdef BUILD_NO_QTOPIA_PLUGIN
+        @echo == qtopia plugin not build.
+  else
         for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
+  endif
 
 build_opie_plugin: build_microkde
   ifdef BUILD_NO_OPIE_PLUGIN
@@ -88,7 +92,7 @@ build_opie_plugin: build_microkde
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
   endif
-  
+
 build_sharp_plugin: build_microkde
   ifdef BUILD_NO_SHARP_PLUGIN
         @echo == ldap plugin not build.
@@ -148,6 +152,7 @@ variable_info:
         @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
         @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN)
         @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN)
+        @echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN)
         @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN)
         ifndef BUILD_NO_SHARP_PLUGIN
         @echo SHARPDTMSDK=$(SHARPDTMSDK)
@@ -172,6 +177,9 @@ variable_test: variable_info
   ifdef BUILD_NO_OPIE_PLUGIN
         @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
   endif
+  ifdef BUILD_NO_QTOPIA_PLUGIN
+        @echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN)
+  endif
   ifdef BUILD_NO_MICROMAIL
         @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
   endif
diff --git a/kmicromail/kmicromailE.pro b/kmicromail/kmicromailE.pro
index 75ba92f..d578a9c 100644
--- a/kmicromail/kmicromailE.pro
+++ b/kmicromail/kmicromailE.pro
@@ -61,6 +61,8 @@ LIBS += $(QTOPIALIB)
 #next line for Zaurus only
 #LIBS +=  -luuid
 
+LIBS += $(GCC3EXTRALIB1)
+LIBS += $(GCC3EXTRALIB2)
 #
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
diff --git a/setZaurus3 b/setZaurus3
index 2649292..5d1fe7b 100755
--- a/setZaurus3
+++ b/setZaurus3
@@ -10,6 +10,7 @@ export OPIEDIR=/kde_dev/opie
 #export BUILD_NO_OPIE_PLUGIN=1
 export BUILD_NO_QTOPIA_PLUGIN=1
 export BUILD_NO_SHARP_PLUGIN=1
+export BUILD_NO_LDAP_PLUGIN=1
 #export BUILD_NO_GAMMU=1
 export QTDIR=/opt/Qtopia/sharp3
 #insert here path to your gcc 3.3.2 compiler