Bug 544913 - Restore NS_PRINTING and use it in packaging; (Av1) Restore NS_PRINTING, Port bug 468463, Use it in packaging.
authorSerge Gautherie <sgautherie.bz@free.fr>
Thu, 11 Feb 2010 02:36:32 +0100
changeset 4880 d99505b45b445601ee92dfa8894a7d3287e88571
parent 4879 8592a000625bf28bc9d4275c01801c6c620969e1
child 4881 d33ff1dfa1f033e1900ae16d65421efc122c8984
push idunknown
push userunknown
push dateunknown
bugs544913, 468463
Bug 544913 - Restore NS_PRINTING and use it in packaging; (Av1) Restore NS_PRINTING, Port bug 468463, Use it in packaging. r=Callek.
calendar/installer/windows/packages-static
config/autoconf.mk.in
configure.in
mail/installer/package-manifest.in
suite/installer/package-manifest.in
--- a/calendar/installer/windows/packages-static
+++ b/calendar/installer/windows/packages-static
@@ -123,17 +123,19 @@ bin\components\htmlparser.xpt
 bin\components\imgicon.xpt
 bin\components\imglib2.xpt
 bin\components\inspector.xpt
 bin\components\intl.xpt
 bin\components\jar.xpt
 bin\components\jsd3250.dll
 bin\components\jsdservice.xpt
 bin\components\layout_base.xpt
+#ifdef NS_PRINTING
 bin\components\layout_printing.xpt
+#endif
 bin\components\layout_xul.xpt
 bin\components\layout_xul_tree.xpt
 bin\components\locale.xpt
 bin\components\loginmgr.xpt
 bin\components\lwbrk.xpt
 bin\components\mimetype.xpt
 #ifdef MOZILLA_1_9_1_BRANCH
 bin\components\mozbrwsr.xpt
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -149,16 +149,17 @@ MOZ_PLACES_BOOKMARKS = @MOZ_PLACES_BOOKM
 MOZ_STORAGE = @MOZ_STORAGE@
 MOZ_SAFE_BROWSING = @MOZ_SAFE_BROWSING@
 MOZ_URL_CLASSIFIER = @MOZ_URL_CLASSIFIER@
 MOZ_ZIPWRITER = @MOZ_ZIPWRITER@
 MOZ_MORK = @MOZ_MORK@
 MOZ_MORKREADER = @MOZ_MORKREADER@
 MOZ_NO_XPCOM_OBSOLETE = @MOZ_NO_XPCOM_OBSOLETE@
 MOZ_NO_FAST_LOAD = @MOZ_NO_FAST_LOAD@
+NS_PRINTING = @NS_PRINTING@
 MOZ_CRASHREPORTER = @MOZ_CRASHREPORTER@
 MOZ_HELP_VIEWER = @MOZ_HELP_VIEWER@
 MOC= @MOC@
 
 TAR=@TAR@
 
 RM = rm -f
 
--- a/configure.in
+++ b/configure.in
@@ -4400,16 +4400,17 @@ MOZ_URL_CLASSIFIER=
 MOZ_USE_NATIVE_UCONV=
 MOZ_VIEW_SOURCE=1
 MOZ_XPFE_COMPONENTS=1
 MOZ_XPINSTALL=1
 MOZ_XSLT_STANDALONE=
 MOZ_XTF=1
 MOZ_XUL=1
 MOZ_ZIPWRITER=1
+NS_PRINTING=1
 XPC_IDISPATCH_SUPPORT=
 
 
 case "$target_os" in
 darwin*)
     ACCESSIBILITY=
     ;;
 *)
@@ -4471,16 +4472,19 @@ basic)
   MOZ_UPDATER=
   MOZ_USE_NATIVE_UCONV=
   MOZ_VIEW_SOURCE=
   MOZ_XPFE_COMPONENTS=
   MOZ_XPINSTALL=
   MOZ_XTF=
   MOZ_ZIPWRITER=
   NS_DISABLE_LOGGING=1
+  if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
+  NS_PRINTING=
+  fi
   ;;
 
 minimal)
   ENABLE_TESTS=
   MOZ_ACTIVEX_SCRIPTING_SUPPORT=
   MOZ_COMPOSER=
   MOZ_ENABLE_CANVAS=
   MOZ_INSTALLER=
@@ -4508,16 +4512,19 @@ minimal)
   MOZ_VIEW_SOURCE=
   MOZ_XPFE_COMPONENTS=
   MOZ_XPINSTALL=
   MOZ_XTF=
   MOZ_XUL=
   MOZ_ZIPWRITER=
   MOZ_RDF=
   NS_DISABLE_LOGGING=1
+  if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
+  NS_PRINTING=
+  fi
   ;;
 
 *)
   AC_MSG_ERROR([Unrecognized value: --with-embedding-profile=$MOZ_EMBEDDING_PROFILE])
   ;;
 esac
 
 MOZ_ARG_WITH_STRING(xulrunner-stub-name,
@@ -4671,16 +4678,17 @@ cairo-gtk2-dfb)
         no_x=yes
     fi
     ;;
 
 cairo-qt)
     MOZ_WIDGET_TOOLKIT=qt
     MOZ_ENABLE_QT=1
     USE_ELF_DYNSTR_GC=
+    NS_PRINTING=
 
     AC_DEFINE(MOZ_X11)
     MOZ_X11=1
 
     TK_CFLAGS='$(MOZ_QT_CFLAGS)'
     TK_LIBS='$(MOZ_QT_LIBS)'
     AC_DEFINE(MOZ_WIDGET_QT)
     ;;
@@ -5115,16 +5123,33 @@ MOZ_ARG_DISABLE_BOOL(jsloader,
 [  --disable-jsloader      Disable xpcom js loader support],
     MOZ_JSLOADER=,
     MOZ_JSLOADER=1 )
 if test "$MOZ_JSLOADER"; then
     AC_DEFINE(MOZ_JSLOADER)
 fi
 
 dnl ========================================================
+dnl Disable printing
+dnl ========================================================
+MOZ_ARG_DISABLE_BOOL(printing,
+[  --disable-printing  Disable printing support],
+    NS_PRINTING=,
+    NS_PRINTING=1 )
+
+if test "$MOZ_WIDGET_TOOLKIT" = "qt"; then
+    AC_MSG_WARN([Printing does not work with Qt at this time. Omitting printing support.])
+    NS_PRINTING=
+fi
+
+if test "$NS_PRINTING"; then
+    AC_DEFINE(NS_PRINTING)
+fi
+
+dnl ========================================================
 dnl use native unicode converters
 dnl ========================================================
 MOZ_ARG_ENABLE_BOOL(native-uconv,
 [  --enable-native-uconv   Enable iconv support],
     MOZ_USE_NATIVE_UCONV=1,
     MOZ_USE_NATIVE_UCONV= )
 if test "$MOZ_USE_NATIVE_UCONV"; then
     AC_DEFINE(MOZ_USE_NATIVE_UCONV)
@@ -6911,16 +6936,17 @@ AC_SUBST(MOZ_LDAP_XPCOM)
 AC_SUBST(MOZ_LDAP_XPCOM_EXPERIMENTAL)
 AC_SUBST(LDAP_CFLAGS)
 AC_SUBST(LDAP_LIBS)
 AC_SUBST(LIBICONV)
 AC_SUBST(MOZ_PLACES)
 AC_SUBST(MOZ_PLACES_BOOKMARKS)
 AC_SUBST(MOZ_STORAGE)
 AC_SUBST(MOZ_FEEDS)
+AC_SUBST(NS_PRINTING)
 
 AC_SUBST(MOZ_PROFILELOCKING)
 
 AC_SUBST(XPCOM_USE_LEA)
 AC_SUBST(BUILD_STATIC_LIBS)
 AC_SUBST(MOZ_ENABLE_LIBXUL)
 AC_SUBST(ENABLE_TESTS)
 AC_SUBST(IBMBIDI)
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -321,17 +321,19 @@
 @BINPATH@/components/content_html.xpt
 @BINPATH@/components/content_htmldoc.xpt
 @BINPATH@/components/content_xmldoc.xpt
 @BINPATH@/components/content_xslt.xpt
 @BINPATH@/components/content_xtf.xpt
 @BINPATH@/components/contentprefs.xpt
 @BINPATH@/components/htmlparser.xpt
 @BINPATH@/components/layout_base.xpt
+#ifdef NS_PRINTING
 @BINPATH@/components/layout_printing.xpt
+#endif
 @BINPATH@/components/layout_xul.xpt
 @BINPATH@/components/xulapp.xpt
 @BINPATH@/components/xuldoc.xpt
 @BINPATH@/components/xultmpl.xpt
 
 @BINPATH@/components/inspector.xpt
 
 ; Imaging:
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -331,17 +331,19 @@
 @BINPATH@/components/jar.xpt
 @BINPATH@/components/jsdservice.xpt
 #ifdef XP_WIN32
 @BINPATH@/components/@DLL_PREFIX@jsd3250@DLL_SUFFIX@
 #else
 @BINPATH@/components/@DLL_PREFIX@jsd@DLL_SUFFIX@
 #endif
 @BINPATH@/components/layout_base.xpt
+#ifdef NS_PRINTING
 @BINPATH@/components/layout_printing.xpt
+#endif
 @BINPATH@/components/layout_xul_tree.xpt
 @BINPATH@/components/layout_xul.xpt
 #ifdef UNIX_BUT_NOT_MAC
 @BINPATH@/components/libimgicon.so
 #endif
 @BINPATH@/components/locale.xpt
 @BINPATH@/components/loginmgr.xpt
 @BINPATH@/components/lwbrk.xpt