Bug 449777 - "clean mozilla-central from unneeded references to composer and camino" [r=ted]

config/autoconf.mk.in

@@ -618,7 +618,6 @@ MOZ_MAPINFO	= @MOZ_MAPINFO@
 MOZ_PHOENIX	= @MOZ_PHOENIX@
 MOZ_XULRUNNER	= @MOZ_XULRUNNER@
 MOZ_XUL_APP	= @MOZ_XUL_APP@
-MOZ_STANDALONE_COMPOSER= @MOZ_STANDALONE_COMPOSER@
 WINCE		= @WINCE@
 
 MOZ_DISTRIBUTION_ID = @MOZ_DISTRIBUTION_ID@

configure.in

@@ -4427,9 +4427,7 @@ MOZ_ARG_ENABLE_STRING(application,
 [  --enable-application=APP
                           Options include:
                             browser (Firefox)
-                            composer
                             xulrunner
-                            camino
                             content/xslt (Standalone Transformiix XSLT)
                             netwerk (Standalone Necko)
                             tools/update-packaging (AUS-related packaging tools)
@@ -4437,11 +4435,6 @@ MOZ_ARG_ENABLE_STRING(application,
                               xpcom/xpconnect or to manually drive a build)],
 [ MOZ_BUILD_APP=$enableval ] )
 
-if test "$MOZ_BUILD_APP" = "macbrowser"; then
-    AC_MSG_WARN([--enable-application=macbrowser is deprecated. Use --enable-application=camino.])
-    MOZ_BUILD_APP=camino
-fi
-
 MOZ_EMBEDDING_PROFILE=default
 MOZ_ARG_WITH_STRING(embedding-profile,
 [  --with-embedding-profile=default|basic|minimal
@@ -4623,18 +4616,10 @@ browser)
   AC_DEFINE(MOZ_PHOENIX)
   ;;
 
-composer)
-  AC_DEFINE(MOZ_STANDALONE_COMPOSER)
-  ;;
-
 xulrunner)
   AC_DEFINE(MOZ_XULRUNNER)
   ;;
 
-camino) 
-  AC_DEFINE(MOZ_MACBROWSER)
-  ;;
-
 content/xslt)
   AC_DEFINE(TX_EXE)
   ;;
@@ -4654,7 +4639,6 @@ fi
 AC_SUBST(MOZ_BUILD_APP)
 AC_SUBST(MOZ_XUL_APP)
 AC_SUBST(MOZ_PHOENIX)
-AC_SUBST(MOZ_STANDALONE_COMPOSER)
 AC_SUBST(MOZ_XULRUNNER)
 
 AC_DEFINE_UNQUOTED(MOZ_BUILD_APP,$MOZ_BUILD_APP)