automatically pull+build storage+sqlite3 when calendar is selected; r=bsmedberg

client.mk

@@ -159,8 +159,9 @@ MODULES_composer :=                             \
 
 MODULES_calendar :=                             \
   $(MODULES_toolkit)                            \
+  mozilla/storage                               \
+  mozilla/db/sqlite3                            \
   mozilla/calendar                              \
-  mozilla/other-licenses/libical                \
   $(NULL)
 
 BOOTSTRAP_calendar := mozilla/calendar/sunbird/config/mozconfig

configure.in

@@ -4587,6 +4587,10 @@ dnl ========================================================
 dnl = Enable mozStorage
 dnl = XXX need to implement --with-system-sqlite3 (see bug 263381)
 dnl ========================================================
+dnl Implicitly enabled by default if building calendar
+if test -n "$MOZ_CALENDAR"; then
+    MOZ_STORAGE=1
+fi
 MOZ_ARG_ENABLE_BOOL(storage,
 [  --enable-storage        Enable mozStorage module and related components],
     MOZ_STORAGE=1,