Attachment #92456 for bug #141344




MOZ_ARG_ENABLE_BOOL(pango,
[  --enable-pango          Enable Pango font rendering support],
    MOZ_ENABLE_PANGO=1,
    MOZ_ENABLE_PANGO=)

if test "$MOZ_ENABLE_PANGO"
then
    AC_DEFINE(MOZ_ENABLE_PANGO)
    PKG_CHECK_MODULES(MOZ_PANGO, pangoxft >= 1.6.0)

    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)




		-lgkgfx \
		$(GFX_XINERAMA_LIBS) \
		$(MOZ_JS_LIBS) \
		$(MOZ_UNICHARUTIL_LIBS) \
		$(MOZ_COMPONENT_LIBS) \
		$(NULL)
endif

ifdef MOZ_ENABLE_PANGO
EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS)
endif

EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS)
CXXFLAGS	+= $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)
CFLAGS		+= $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)

ifeq ($(OS_ARCH), SunOS)
ifndef GNU_CC
# When using Sun's WorkShop compiler, including
# /wherever/workshop-5.0/SC5.0/include/CC/std/time.h




ifdef MOZ_ENABLE_XPRINT
STATIC_EXTRA_LIBS	+= $(MOZ_XPRINT_LDFLAGS)
endif

ifdef MOZ_ENABLE_XFT
STATIC_EXTRA_LIBS      += $(MOZ_XFT_LIBS)
endif

ifdef MOZ_ENABLE_PANGO
STATIC_EXTRA_LIBS	+= $(MOZ_PANGO_LIBS)
endif

# Component Makefile always brings in this.
# STATIC_EXTRA_LIBS	+= $(TK_LIBS)

# Some random modules require this
ifndef MINIMO
STATIC_EXTRA_LIBS	+= $(MOZ_XPCOM_OBSOLETE_LIBS)
endif


Return to bug 141344

Lines 4577-4593 Link Here

(-)configure.in (-1 / +1 lines)
4577	MOZ_ARG_ENABLE_BOOL(pango,	4577	MOZ_ARG_ENABLE_BOOL(pango,
4578	[ --enable-pango Enable Pango font rendering support],	4578	[ --enable-pango Enable Pango font rendering support],
4579	MOZ_ENABLE_PANGO=1,	4579	MOZ_ENABLE_PANGO=1,
4580	MOZ_ENABLE_PANGO=)	4580	MOZ_ENABLE_PANGO=)
4581		4581
4582	if test "$MOZ_ENABLE_PANGO"	4582	if test "$MOZ_ENABLE_PANGO"
4583	then	4583	then
4584	AC_DEFINE(MOZ_ENABLE_PANGO)	4584	AC_DEFINE(MOZ_ENABLE_PANGO)
4585	PKG_CHECK_MODULES(MOZ_PANGO, pango >= 1.6.0 pangoft2 >= 1.6.0)	4585	PKG_CHECK_MODULES(MOZ_PANGO, pangoxft >= 1.6.0)
4586		4586
4587	AC_SUBST(MOZ_ENABLE_PANGO)	4587	AC_SUBST(MOZ_ENABLE_PANGO)
4588	AC_SUBST(MOZ_PANGO_CFLAGS)	4588	AC_SUBST(MOZ_PANGO_CFLAGS)
4589	AC_SUBST(MOZ_PANGO_LIBS)	4589	AC_SUBST(MOZ_PANGO_LIBS)
4590	fi	4590	fi
4591		4591
4592	dnl ========================================================	4592	dnl ========================================================
4593	dnl = x11 core font support (default and ability to enable depend on toolkit)	4593	dnl = x11 core font support (default and ability to enable depend on toolkit)

Lines 198-213 Link Here

(-)gfx/src/gtk/Makefile.in (+4 lines)
198	-lgkgfx \	198	-lgkgfx \
199	$(GFX_XINERAMA_LIBS) \	199	$(GFX_XINERAMA_LIBS) \
200	$(MOZ_JS_LIBS) \	200	$(MOZ_JS_LIBS) \
201	$(MOZ_UNICHARUTIL_LIBS) \	201	$(MOZ_UNICHARUTIL_LIBS) \
202	$(MOZ_COMPONENT_LIBS) \	202	$(MOZ_COMPONENT_LIBS) \
203	$(NULL)	203	$(NULL)
204	endif	204	endif
205		205
		206	ifdef MOZ_ENABLE_PANGO
		207	EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS)
		208	endif
		209
206	EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS)	210	EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS)
207	CXXFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)	211	CXXFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)
208	CFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)	212	CFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)
209		213
210	ifeq ($(OS_ARCH), SunOS)	214	ifeq ($(OS_ARCH), SunOS)
211	ifndef GNU_CC	215	ifndef GNU_CC
212	# When using Sun's WorkShop compiler, including	216	# When using Sun's WorkShop compiler, including
213	# /wherever/workshop-5.0/SC5.0/include/CC/std/time.h	217	# /wherever/workshop-5.0/SC5.0/include/CC/std/time.h

Lines 115-130 Link Here

(-)config/static-config.mk (+4 lines)
115	ifdef MOZ_ENABLE_XPRINT	115	ifdef MOZ_ENABLE_XPRINT
116	STATIC_EXTRA_LIBS += $(MOZ_XPRINT_LDFLAGS)	116	STATIC_EXTRA_LIBS += $(MOZ_XPRINT_LDFLAGS)
117	endif	117	endif
118		118
119	ifdef MOZ_ENABLE_XFT	119	ifdef MOZ_ENABLE_XFT
120	STATIC_EXTRA_LIBS += $(MOZ_XFT_LIBS)	120	STATIC_EXTRA_LIBS += $(MOZ_XFT_LIBS)
121	endif	121	endif
122		122
		123	ifdef MOZ_ENABLE_PANGO
		124	STATIC_EXTRA_LIBS += $(MOZ_PANGO_LIBS)
		125	endif
		126
123	# Component Makefile always brings in this.	127	# Component Makefile always brings in this.
124	# STATIC_EXTRA_LIBS += $(TK_LIBS)	128	# STATIC_EXTRA_LIBS += $(TK_LIBS)
125		129
126	# Some random modules require this	130	# Some random modules require this
127	ifndef MINIMO	131	ifndef MINIMO
128	STATIC_EXTRA_LIBS += $(MOZ_XPCOM_OBSOLETE_LIBS)	132	STATIC_EXTRA_LIBS += $(MOZ_XPCOM_OBSOLETE_LIBS)
129	endif	133	endif
130		134