зеркало из https://github.com/mozilla/gecko-dev.git
Bug 338446 - fix gtk2 pango builds, p=wuno@lsvw.de, r=bsmedberg
This commit is contained in:
Родитель
a4651436fa
Коммит
b1b77db46b
|
@ -4915,7 +4915,7 @@ MOZ_ARG_ENABLE_BOOL(pango,
|
|||
if test "$MOZ_ENABLE_PANGO" && test -z "$MOZ_ENABLE_CAIRO_GFX"
|
||||
then
|
||||
AC_DEFINE(MOZ_ENABLE_PANGO)
|
||||
PKG_CHECK_MODULES(MOZ_PANGO, pango >= 1.6.0 pangoft2 >= 1.6.0)
|
||||
PKG_CHECK_MODULES(MOZ_PANGO, pangoxft >= 1.6.0)
|
||||
|
||||
AC_SUBST(MOZ_ENABLE_PANGO)
|
||||
AC_SUBST(MOZ_PANGO_CFLAGS)
|
||||
|
|
|
@ -178,6 +178,10 @@ EXTRA_DSO_LDOPTS += \
|
|||
$(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)
|
||||
|
|
|
@ -78,10 +78,11 @@ ifdef MOZ_ENABLE_GLITZ
|
|||
EXTRA_DSO_LDOPTS += -lmozglitzagl -framework OpenGL -framework AGL
|
||||
endif
|
||||
endif
|
||||
ifeq ($(MOZ_GFX_TOOLKIT),gtk2)
|
||||
endif # MOZ_ENABLE_CAIRO_GFX
|
||||
|
||||
ifdef MOZ_ENABLE_PANGO
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS)
|
||||
endif
|
||||
endif # MOZ_ENABLE_CAIRO_GFX
|
||||
|
||||
ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG))
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS)
|
||||
|
|
Загрузка…
Ссылка в новой задаче