Separate out organizer parts of versit to a separate module

This now generates a new shared library, QtVersitOrganizer.so
For clients wishing to use it, they simply need to have:
MOBILITY += versit organizer
in their .pro file.

1 files changed, 3 insertions, 3 deletions

diff --git a/configure b/configure
index ced0af30c3..5f8f924949 100755
--- a/configure
+++ b/configure
@@ -541,7 +541,7 @@ fi
 
 # It's a lot easier to make qmake do the dependency checking...
 echo "mobility_modules = $MOBILITY_MODULES" >> "$CONFIG_IN"
-echo "contains(mobility_modules,versit): mobility_modules *= contacts organizer" >> "$CONFIG_IN"
+echo "contains(mobility_modules,versit): mobility_modules *= contacts" >> "$CONFIG_IN"
 echo "maemo5|maemo6:contains(maemo-icd_enabled, no): mobility_modules -= bearer" >> "$CONFIG_IN"
 
 # If libicd-network-wlan-dev.h is not present, use own copy.
@@ -592,13 +592,13 @@ for module in $MOBILITY_MODULES; do
             $relpath/bin/syncheaders $shadowpath/include/QtTelephony $relpath/src/telephony
             ;;
         versit)
-            #versit implies contacts & organizer
+            #versit implies contacts.  organizer includes might also be necessary
             $relpath/bin/syncheaders $shadowpath/include/QtVersit $relpath/src/versit
             $relpath/bin/syncheaders $shadowpath/include/QtContacts $relpath/src/contacts
             $relpath/bin/syncheaders $shadowpath/include/QtContacts $relpath/src/contacts/details
             $relpath/bin/syncheaders $shadowpath/include/QtContacts $relpath/src/contacts/requests
             $relpath/bin/syncheaders $shadowpath/include/QtContacts $relpath/src/contacts/filters
-            $relpath/bin/syncheaders $shadowpath/include/QtOrganizer $relpath/src/organizer
+            $relpath/bin/syncheaders $shadowpath/include/QtVersitOrganizer $relpath/src/versitorganizer
             ;;
         sensors)
             $relpath/bin/syncheaders $shadowpath/include/QtSensors $relpath/src/sensors