use MOZ_SUNBIRD to build sunbird.

bug 245189, r=bsmedberg, approved by mostafah

Makefile.in

@@ -338,6 +338,10 @@ ifdef MOZ_STANDALONE_COMPOSER
 tier_99_dirs	+= composer
 endif
 
+ifdef MOZ_SUNBIRD
+tier_99_dirs	+= calendar/sunbird
+endif
+
 ifdef MOZ_XUL_APP
 ifdef MOZ_INSTALLER
 tier_99_dirs     +=  toolkit/mozapps/installer

allmakefiles.sh

@@ -979,6 +979,12 @@ composer/base/Makefile
 xpfe/components/build2/Makefile
 "
 
+MAKEFILES_sunbird="
+calendar/sunbird/Makefile
+calendar/sunbird/app/Makefile
+calendar/sunbird/base/Makefile
+"
+
 MAKEFILES_sql="
 extensions/sql/Makefile
 extensions/sql/base/Makefile
@@ -1473,6 +1479,10 @@ if test -n "$MOZ_STANDALONE_COMPOSER"; then
     add_makefiles "$MAKEFILES_standalone_composer"
 fi
 
+if test -n "$MOZ_SUNBIRD"; then
+    add_makefiles "$MAKEFILES_sunbird"
+fi
+
 if test -n "$MOZ_IPCD"; then
     add_makefiles "$MAKEFILES_ipcd"
 fi

calendar/sunbird/Makefile.in

@@ -36,9 +36,9 @@
 # ***** END LICENSE BLOCK *****
 
 DEPTH		= ../..
-topsrcdir	= ../..
-srcdir		= .
-VPATH		= .
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 

client.mk

@@ -439,6 +439,14 @@ FASTUPDATE_STANDALONE_COMPOSER:= true
 CHECKOUT_STANDALONE_COMPOSER:= true
 endif
 
+####################################
+# CVS defines for Sunbird (pulled and built if MOZ_SUNBIRD is set)
+#
+
+ifdef MOZ_SUNBIRD
+MOZ_XUL_APP = 1
+endif
+
 ####################################
 # CVS defines for mozilla/toolkit (pulled and built if MOZ_XUL_APP is set)
 #

config/autoconf.mk.in

@@ -464,6 +464,7 @@ MOZ_XUL_APP	= @MOZ_XUL_APP@
 MOZ_THUNDERBIRD = @MOZ_THUNDERBIRD@
 MOZ_STANDALONE_COMPOSER= @MOZ_STANDALONE_COMPOSER@
 MOZ_STATIC_MAIL_BUILD = @MOZ_STATIC_MAIL_BUILD@
+MOZ_SUNBIRD	= @MOZ_SUNBIRD@
 
 MINIMO		= @MINIMO@
 

configure.in

@@ -3366,7 +3366,6 @@ if test "$MOZ_THUNDERBIRD"; then
 fi
 
 AC_SUBST(MOZ_THUNDERBIRD)
-AC_SUBST(MOZ_XUL_APP)
 
 dnl ========================================================
 dnl = Standalone Composer
@@ -3381,6 +3380,20 @@ if test "$MOZ_STANDALONE_COMPOSER"; then
 fi
 
 AC_SUBST(MOZ_STANDALONE_COMPOSER)
+
+dnl ========================================================
+dnl = Sunbird
+dnl ========================================================
+if test "$MOZ_SUNBIRD"; then
+   AC_DEFINE(MOZ_SUNBIRD)
+
+   MOZ_XUL_APP=1
+   AC_DEFINE(MOZ_XUL_APP)
+   MOZ_APP_NAME=sunbird
+   MOZ_APP_VERSION=`cat $topsrcdir/calendar/sunbird/config/version.txt`
+fi
+
+AC_SUBST(MOZ_SUNBIRD)
 AC_SUBST(MOZ_XUL_APP)
 AC_DEFINE_UNQUOTED(MOZ_APP_NAME, "$MOZ_APP_NAME")
 

xpfe/components/Makefile.in

@@ -49,6 +49,9 @@ endif
 ifdef MOZ_STANDALONE_COMPOSER
 MOZ_HAVE_BROWSER=
 endif
+ifdef MOZ_SUNBIRD
+MOZ_HAVE_BROWSER=
+endif
 ifdef MOZ_PHOENIX
 # Firefox uses this flag to stop the automatic processing of the jar.mn file
 # that lives parallel to this Makefile. The jar.mn is responsible for the