bug 343640 - trying again - error out when building using --enable-calendar with a nice error message. r=dmose,sr=bsmedberg

configure.in

@@ -4098,7 +4098,7 @@ MOZ_ARG_ENABLE_STRING(application,
                             mail (Thunderbird)
                             minimo
                             composer
-                            calendar
+                            calendar (Sunbird)
                             xulrunner
                             macbrowser (Camino)
                             content/xslt (Standalone Transformiix XSLT)
@@ -4760,11 +4760,17 @@ AC_SUBST(MOZ_UI_LOCALE)
 dnl =========================================================
 dnl = Calendar client
 dnl =========================================================
-MOZ_ARG_ENABLE_BOOL(calendar,
+MOZ_ARG_ENABLE_BOOL(calendar,,
-[  --enable-calendar       Enable building of the calendar client],
+    MOZ_OLD_CALENDAR=1,
-    MOZ_CALENDAR=1,
+    MOZ_OLD_CALENDAR= )
-    MOZ_CALENDAR= )
+
-AC_SUBST(MOZ_CALENDAR)
+if test "$MOZ_OLD_CALENDAR"; then
+    AC_MSG_WARN([Building with the calendar extension is no longer supported.])
+    if test "$MOZ_THUNDERBIRD"; then
+        AC_MSG_WARN([Since you're trying to build mail, you could try adding '--enable-extensions=default,lightning' to your mozconfig and building WITH A FRESH TREE.])
+    fi
+    AC_MSG_ERROR([See http://www.mozilla.org/projects/calendar/ for more information.])
+fi
 
 dnl =========================================================
 dnl = Mail & News