Bug 376790: remove support for non-cairo GFX ports from configure.in, r=ted.mielczarek, a=mtschrep
authormozilla@weilbacher.org
Wed, 23 Jan 2008 00:27:47 -0800
changeset 10568 fea7b827a5d2fe16a2a77d6537d7d7b0f06de721
parent 10567 ab32e95877c898fbbeb6e1eb841df8443a628113
child 10569 9358f97ff2b013526dbaec29f2f6267625ac8de8
push idunknown
push userunknown
push dateunknown
reviewersted, mtschrep
bugs376790
milestone1.9b3pre
Bug 376790: remove support for non-cairo GFX ports from configure.in, r=ted.mielczarek, a=mtschrep
config/autoconf.mk.in
config/static-config.mk
configure.in
gfx/src/thebes/Makefile.in
gfx/thebes/src/Makefile.in
gfx/thebes/test/Makefile.in
gfx/thebes/test/gfxFontSelectionTest.cpp
intl/build/Makefile.in
intl/lwbrk/src/Makefile.in
modules/libpref/src/init/all.js
toolkit/library/Makefile.in
toolkit/library/libxul-rules.mk
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -483,22 +483,18 @@ MOZ_DBUS_GLIB_LIBS      = @MOZ_DBUS_GLIB
 MOZ_ENABLE_DBUS         = @MOZ_ENABLE_DBUS@
 
 MOZ_GTHREAD_CFLAGS      = @MOZ_GTHREAD_CFLAGS@
 MOZ_GTHREAD_LIBS        = @MOZ_GTHREAD_LIBS@
 
 FT2_CFLAGS             = @FT2_CFLAGS@
 FT2_LIBS               = @FT2_LIBS@
 
-MOZ_ENABLE_XFT		= @MOZ_ENABLE_XFT@
 MOZ_XFT_CFLAGS		= @MOZ_XFT_CFLAGS@
 MOZ_XFT_LIBS		= @MOZ_XFT_LIBS@
-MOZ_ENABLE_COREXFONTS	= @MOZ_ENABLE_COREXFONTS@
-
-MOZ_ENABLE_PANGO        = @MOZ_ENABLE_PANGO@
 MOZ_PANGO_CFLAGS        = @MOZ_PANGO_CFLAGS@
 MOZ_PANGO_LIBS          = @MOZ_PANGO_LIBS@
 
 MOZ_EXTRA_X11CONVERTERS	= @MOZ_EXTRA_X11CONVERTERS@
 
 MOZ_XIE_LIBS		= @MOZ_XIE_LIBS@
 XT_LIBS			= @XT_LIBS@
 
--- a/config/static-config.mk
+++ b/config/static-config.mk
@@ -83,23 +83,17 @@ STATIC_EXTRA_LIBS	+= \
 		$(LDAP_LIBS) \
 		$(NULL)
 endif
 
 STATIC_EXTRA_LIBS	+= $(MOZ_CAIRO_LIBS)
 
 ifdef MOZ_ENABLE_GTK2
 STATIC_EXTRA_LIBS	+= $(XLDFLAGS) $(XT_LIBS) -lgthread-2.0
-endif
-
-ifdef MOZ_ENABLE_XFT
 STATIC_EXTRA_LIBS	+= $(MOZ_XFT_LIBS)
-endif
-
-ifdef MOZ_ENABLE_PANGO
 STATIC_EXTRA_LIBS	+= $(MOZ_PANGO_LIBS)
 endif
 
 ifdef MOZ_STORAGE
 EXTRA_DSO_LIBS += sqlite3
 endif
 
 ifdef MOZ_ENABLE_STARTUP_NOTIFICATION
--- a/configure.in
+++ b/configure.in
@@ -1819,17 +1819,16 @@ case "$target" in
     AC_DEFINE(STDC_HEADERS)
     AC_DEFINE(NEW_H, <new>)
     AC_DEFINE(WIN32_LEAN_AND_MEAN)
 
     TARGET_MD_ARCH=win32
     _PLATFORM_DEFAULT_TOOLKIT='windows'
     BIN_SUFFIX='.exe'
     USE_SHORT_LIBNAME=1
-    MOZ_ENABLE_COREXFONTS=
     MOZ_ENABLE_POSTSCRIPT=
     MOZ_USER_DIR="Mozilla"
 ;;
 
 
 *-mingw*|*-cygwin*|*-msvc*|*-mks*)
     DSO_CFLAGS=
     DSO_PIC_CFLAGS=
@@ -4790,91 +4789,31 @@ MOZ_ARG_WITH_STRING(distribution-id,
 if test -z "$MOZ_DISTRIBUTION_ID"; then
    MOZ_DISTRIBUTION_ID="org.mozilla"
 fi
 
 AC_DEFINE_UNQUOTED(MOZ_DISTRIBUTION_ID,"$MOZ_DISTRIBUTION_ID")
 AC_SUBST(MOZ_DISTRIBUTION_ID)
 
 dnl ========================================================
-dnl = Xft
-dnl ========================================================
-if test "$MOZ_ENABLE_GTK2"; then
-    MOZ_ENABLE_XFT=1
-fi
-
-MOZ_ARG_DISABLE_BOOL(xft,
-[  --disable-xft           Disable Xft support ],
-    MOZ_ENABLE_XFT=,
-    MOZ_ENABLE_XFT=1)
-
-if test "$MOZ_ENABLE_XFT" && test -z "$MOZ_ENABLE_GTK2"; then
-    AC_MSG_ERROR([Cannot enable XFT support for non-GTK2 toolkits.])
-fi
-
-if test "$MOZ_ENABLE_XFT"
+dnl = Xft and Pango
+dnl ========================================================
+if test "$MOZ_ENABLE_GTK2"
 then
-    AC_DEFINE(MOZ_ENABLE_XFT)
     PKG_CHECK_MODULES(MOZ_XFT, xft)
+    AC_SUBST(MOZ_XFT_CFLAGS)
+    AC_SUBST(MOZ_XFT_LIBS)
+
     PKG_CHECK_MODULES(_PANGOCHK, pango >= $PANGO_VERSION)
-fi
-
-AC_SUBST(MOZ_ENABLE_XFT)
-AC_SUBST(MOZ_XFT_CFLAGS)
-AC_SUBST(MOZ_XFT_LIBS)
-
-dnl ========================================================
-dnl = pango font rendering
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(pango,
-[  --enable-pango          Enable Pango font rendering support],
-    MOZ_ENABLE_PANGO=1,
-    MOZ_ENABLE_PANGO=)
-
-if test "$MOZ_ENABLE_PANGO" && test -z "$MOZ_ENABLE_CAIRO_GFX"
-then
-    AC_MSG_ERROR([Cairo gfx is required for Pango font rendering])
-fi
-
-if test "$MOZ_ENABLE_GTK2" && test "$MOZ_ENABLE_CAIRO_GFX"
-then
-    # For gtk2, we require --enable-pango; gtk2 already implies --enable-xft
-    if test -z "$MOZ_ENABLE_PANGO"
-    then
-        AC_MSG_WARN([Pango is required for cairo gfx builds, assuming --enable-pango])
-        MOZ_ENABLE_PANGO=1
-    fi
-fi
-
-if test "$MOZ_ENABLE_PANGO" && test "$MOZ_ENABLE_CAIRO_GFX"
-then
-    AC_DEFINE(MOZ_ENABLE_PANGO)
     PKG_CHECK_MODULES(MOZ_PANGO, pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION)
-    AC_SUBST(MOZ_ENABLE_PANGO)
     AC_SUBST(MOZ_PANGO_CFLAGS)
     AC_SUBST(MOZ_PANGO_LIBS)
 fi
 
 dnl ========================================================
-dnl = x11 core font support (default and ability to enable depend on toolkit)
-dnl ========================================================
-if test "$MOZ_X11"
-then
-    MOZ_ENABLE_COREXFONTS=${MOZ_ENABLE_COREXFONTS-1}
-else
-    MOZ_ENABLE_COREXFONTS=
-fi
-if test "$MOZ_ENABLE_COREXFONTS"
-then
-    AC_DEFINE(MOZ_ENABLE_COREXFONTS)
-fi
-
-AC_SUBST(MOZ_ENABLE_COREXFONTS)
-
-dnl ========================================================
 dnl = PostScript print module
 dnl ========================================================
 MOZ_ARG_DISABLE_BOOL(postscript,
 [  --disable-postscript    Disable PostScript printing support ],
     MOZ_ENABLE_POSTSCRIPT=,
     MOZ_ENABLE_POSTSCRIPT=1 )
 
 dnl ========================================================
@@ -5015,18 +4954,17 @@ AC_SUBST(MOZ_DBUS_GLIB_LIBS)
 dnl ========================================================
 dnl = Setting MOZ_EXTRA_X11CONVERTERS turns on additional 
 dnl = converters in intl/uconv that are used only by X11 gfx 
 dnl = implementations. By default, it's undefined so that 
 dnl = those converters are not built on other platforms/toolkits. 
 dnl = (see bug 180851)
 dnl ========================================================
 
-if test "$MOZ_ENABLE_GTK2" \
-&& test "$MOZ_ENABLE_COREXFONTS"
+if test "$MOZ_ENABLE_GTK2"
 then
     AC_DEFINE(MOZ_EXTRA_X11CONVERTERS)
     MOZ_EXTRA_X11CONVERTERS=1
 fi
 AC_SUBST(MOZ_EXTRA_X11CONVERTERS)
 
 dnl ========================================================
 dnl = Build Personal Security Manager
--- a/gfx/src/thebes/Makefile.in
+++ b/gfx/src/thebes/Makefile.in
@@ -155,17 +155,14 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS  += $(TK_CFLAGS)
 CFLAGS    += $(TK_CFLAGS)
 
 ifdef MOZ_ENABLE_GTK2
 DEFINES += -DMOZ_ENABLE_GTK2
-endif
-
-ifdef MOZ_ENABLE_PANGO
 CXXFLAGS += $(MOZ_PANGO_CFLAGS)
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 CXXFLAGS += $(CAIRO_FT_CFLAGS)
 endif
--- a/gfx/thebes/src/Makefile.in
+++ b/gfx/thebes/src/Makefile.in
@@ -139,17 +139,17 @@ EXTRA_DSO_LDOPTS += $(TK_LIBS)
 DEFINES += -DIMPL_THEBES
 
 include $(topsrcdir)/config/rules.mk
 
 
 CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
 CFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
 
-ifdef MOZ_ENABLE_PANGO
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 CXXFLAGS += $(MOZ_PANGO_CFLAGS)
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
 CXXFLAGS += $(CAIRO_FT_CFLAGS)
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
--- a/gfx/thebes/test/Makefile.in
+++ b/gfx/thebes/test/Makefile.in
@@ -91,16 +91,13 @@ OS_LIBS += $(call EXPAND_LIBNAME,$(_OS_L
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 OS_LIBS += -framework Cocoa
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 OS_LIBS += $(MOZ_PANGO_LIBS) $(MOZ_XFT_LIBS) $(XLIBS)
+CXXFLAGS += $(MOZ_PANGO_CFLAGS)
 endif
 
 CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
 CFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
-
-ifdef MOZ_ENABLE_PANGO
-CXXFLAGS += $(MOZ_PANGO_CFLAGS)
-endif
--- a/gfx/thebes/test/gfxFontSelectionTest.cpp
+++ b/gfx/thebes/test/gfxFontSelectionTest.cpp
@@ -179,17 +179,17 @@ struct TestEntry {
                  const LiteralArray& glyphs)
     {
 #if defined(XP_WIN)
         if (strcmp(platform, "win32"))
             return;
 #elif defined(XP_MACOSX)
         if (strcmp(platform, "macosx"))
             return;
-#elif defined(MOZ_ENABLE_PANGO)
+#elif defined(XP_UNIX)
         if (strcmp(platform, "gtk2-pango"))
             return;
 #else
         return;
 #endif
 
         expectItems.AppendElement(ExpectItem(fontName, glyphs));
     }
--- a/intl/build/Makefile.in
+++ b/intl/build/Makefile.in
@@ -101,17 +101,17 @@ EXTRA_DSO_LDOPTS = \
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 EXTRA_DSO_LDOPTS += \
         $(TK_LIBS) \
         $(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
 
-ifdef MOZ_ENABLE_PANGO
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 EXTRA_DSO_LDOPTS += \
 		$(MOZ_PANGO_LIBS) \
 		$(NULL)
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 OS_LIBS += $(call EXPAND_LIBNAME,usp10)
 endif
--- a/intl/lwbrk/src/Makefile.in
+++ b/intl/lwbrk/src/Makefile.in
@@ -53,17 +53,17 @@ REQUIRES	= xpcom \
 		  $(NULL)
 
 CPPSRCS		= \
 		nsJISx4501LineBreaker.cpp \
 		nsSampleWordBreaker.cpp \
 		nsSemanticUnitScanner.cpp \
 		$(NULL)
 
-ifdef MOZ_ENABLE_PANGO
+ifeq  ($(MOZ_WIDGET_TOOLKIT),gtk2)
 CPPSRCS		+= \
 		nsPangoBreaker.cpp \
 		$(NULL)
 else
 ifeq  ($(MOZ_WIDGET_TOOLKIT),windows)
 CPPSRCS		+= \
 		nsUniscribeBreaker.cpp \
 		$(NULL)
@@ -79,13 +79,13 @@ CPPSRCS		+= \
 
 CSRCS		= rulebrk.c
 endif
 endif
 endif
 
 include $(topsrcdir)/config/rules.mk
 
-ifdef MOZ_ENABLE_PANGO
+ifeq  ($(MOZ_WIDGET_TOOLKIT),gtk2)
 CXXFLAGS	+= \
 		$(MOZ_PANGO_CFLAGS) \
 		$(NULL)
 endif
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -2138,18 +2138,16 @@ pref("print.whileInPrintPreview", false)
 
 pref("font.allow_double_byte_special_chars", true);
 // font names
 
 pref("font.alias-list", "sans,sans-serif,serif,monospace");
 
 // ar
 
-#ifdef MOZ_ENABLE_XFT
-
 pref("font.name.serif.el", "serif");
 pref("font.name.sans-serif.el", "sans-serif");
 pref("font.name.monospace.el", "monospace");
 
 pref("font.name.serif.he", "serif");
 pref("font.name.sans-serif.he", "sans-serif");
 pref("font.name.monospace.he", "monospace");
 
@@ -2197,77 +2195,16 @@ pref("font.name.monospace.zh-CN", "monos
 
 // ming_uni.ttf (HKSCS-2001) 
 // http://www.info.gov.hk/digital21/eng/hkscs/download/uime.exe
 pref("font.name.serif.zh-HK", "serif");
 pref("font.name.sans-serif.zh-HK", "sans-serif");
 pref("font.name.monospace.zh-HK", "monospace");
 
 // zh-TW
-# MOZ_ENABLE_XFT
-#else
-pref("font.name.serif.el", "misc-fixed-iso8859-7");
-pref("font.name.sans-serif.el", "misc-fixed-iso8859-7");
-pref("font.name.monospace.el", "misc-fixed-iso8859-7");
-
-pref("font.name.serif.he", "misc-fixed-iso8859-8");
-pref("font.name.sans-serif.he", "misc-fixed-iso8859-8");
-pref("font.name.monospace.he", "misc-fixed-iso8859-8");
-
-pref("font.name.serif.ja", "jis-fixed-jisx0208.1983-0");
-pref("font.name.sans-serif.ja", "jis-fixed-jisx0208.1983-0");
-pref("font.name.monospace.ja", "jis-fixed-jisx0208.1983-0");
-
-pref("font.name.serif.ko", "daewoo-mincho-ksc5601.1987-0");
-pref("font.name.sans-serif.ko", "daewoo-mincho-ksc5601.1987-0");
-pref("font.name.monospace.ko", "daewoo-mincho-ksc5601.1987-0");
-
-// th
-
-pref("font.name.serif.tr", "adobe-times-iso8859-9");
-pref("font.name.sans-serif.tr", "adobe-helvetica-iso8859-9");
-pref("font.name.monospace.tr", "adobe-courier-iso8859-9");
-
-pref("font.name.serif.x-baltic", "b&h-lucidux serif-iso8859-4");
-pref("font.name.sans-serif.x-baltic", "b&h-lucidux sans-iso8859-4");
-pref("font.name.monospace.x-baltic", "b&h-lucidux mono-iso8859-4");
-
-pref("font.name.serif.x-central-euro", "adobe-times-iso8859-2");
-pref("font.name.sans-serif.x-central-euro", "adobe-helvetica-iso8859-2");
-pref("font.name.monospace.x-central-euro", "adobe-courier-iso8859-2");
-
-pref("font.name.serif.x-cyrillic", "cronyx-times-koi8-r");
-pref("font.name.sans-serif.x-cyrillic", "cronyx-helvetica-koi8-r");
-pref("font.name.monospace.x-cyrillic", "cronyx-courier-koi8-r");
-
-pref("font.name.serif.x-unicode", "adobe-times-iso8859-1");
-pref("font.name.sans-serif.x-unicode", "adobe-helvetica-iso8859-1");
-pref("font.name.monospace.x-unicode", "adobe-courier-iso8859-1");
-
-pref("font.name.serif.x-user-def", "adobe-times-iso8859-1");
-pref("font.name.sans-serif.x-user-def", "adobe-helvetica-iso8859-1");
-pref("font.name.monospace.x-user-def", "adobe-courier-iso8859-1");
-
-pref("font.name.serif.x-western", "adobe-times-iso8859-1");
-pref("font.name.sans-serif.x-western", "adobe-helvetica-iso8859-1");
-pref("font.name.monospace.x-western", "adobe-courier-iso8859-1");
-
-pref("font.name.serif.zh-CN", "isas-song ti-gb2312.1980-0");
-pref("font.name.sans-serif.zh-CN", "isas-song ti-gb2312.1980-0");
-pref("font.name.monospace.zh-CN", "isas-song ti-gb2312.1980-0");
-
-// ming_uni.ttf (HKSCS-2001) 
-// http://www.info.gov.hk/digital21/eng/hkscs/download/uime.exe
-pref("font.name.serif.zh-HK", "-arphic-Ming for ISO10646-big5hkscs-0");
-pref("font.name.sans-serif.zh-HK", "-arphic-Ming for ISO10646-big5hkscs-0");
-pref("font.name.monospace.zh-HK", "-arphic-Ming for ISO10646-big5hkscs-0");
-
-// zh-TW
-# MOZ_ENABLE_XFT
-#endif
 
 pref("font.default.ar", "sans-serif");
 pref("font.size.variable.ar", 16);
 pref("font.size.fixed.ar", 12);
 
 pref("font.default.el", "serif");
 pref("font.size.variable.el", 16);
 pref("font.size.fixed.el", 12);
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -207,19 +207,16 @@ EXTRA_DSO_LDOPTS += \
 	-framework IOKit \
 	-lcrypto \
 	$(TK_LIBS) \
 	$(NULL)
 endif
 
 ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
 EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0
-endif
-
-ifdef MOZ_ENABLE_XFT
 EXTRA_DSO_LDOPTS += $(FT2_LIBS)
 endif
 
 ifdef MOZ_ENABLE_STARTUP_NOTIFICATION
 EXTRA_DSO_LDOPTS += $(MOZ_STARTUP_NOTIFICATION_LIBS)
 endif
 
 ifeq ($(OS_ARCH),BeOS)
--- a/toolkit/library/libxul-rules.mk
+++ b/toolkit/library/libxul-rules.mk
@@ -76,17 +76,17 @@ endif
 ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),mac cocoa))
 EXTRA_DSO_LDOPTS += -lcups
 ifdef MOZ_ENABLE_GLITZ
 EXTRA_DSO_LDOPTS += -lmozglitzagl -framework OpenGL -framework AGL
 endif
 endif
 endif # MOZ_ENABLE_CAIRO_GFX
 
-ifdef MOZ_ENABLE_PANGO
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS)
 endif
 
 EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS)
 
 export:: dlldeps.cpp
 
 dlldeps.cpp: $(topsrcdir)/xpcom/build/dlldeps.cpp