Changeset View
Changeset View
Standalone View
Standalone View
www/firefox/files/patch-bug847568
Show First 20 Lines • Show All 207 Lines • ▼ Show 20 Lines | |||||
+ | + | ||||
dnl ======================================================== | dnl ======================================================== | ||||
dnl Check for pixman and cairo | dnl Check for pixman and cairo | ||||
dnl ======================================================== | dnl ======================================================== | ||||
diff --git toolkit/library/moz.build toolkit/library/moz.build | diff --git toolkit/library/moz.build toolkit/library/moz.build | ||||
index 24f940e1ed7e..079a575adec3 100644 | index 24f940e1ed7e..079a575adec3 100644 | ||||
--- toolkit/library/moz.build | --- toolkit/library/moz.build | ||||
+++ toolkit/library/moz.build | +++ toolkit/library/moz.build | ||||
@@ -231,6 +231,12 @@ if CONFIG['MOZ_SYSTEM_JPEG']: | @@ -238,6 +238,12 @@ if CONFIG['MOZ_SYSTEM_JPEG']: | ||||
if CONFIG['MOZ_SYSTEM_PNG']: | if CONFIG['MOZ_SYSTEM_PNG']: | ||||
OS_LIBS += CONFIG['MOZ_PNG_LIBS'] | OS_LIBS += CONFIG['MOZ_PNG_LIBS'] | ||||
+if CONFIG['MOZ_SYSTEM_GRAPHITE2']: | +if CONFIG['MOZ_SYSTEM_GRAPHITE2']: | ||||
+ OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS'] | + OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS'] | ||||
+ | + | ||||
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: | +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: | ||||
+ OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] | + OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] | ||||
+ | + | ||||
if CONFIG['MOZ_SYSTEM_HUNSPELL']: | if CONFIG['MOZ_SYSTEM_LIBEVENT']: | ||||
OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] | OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] | ||||
diff --git toolkit/moz.configure toolkit/moz.configure | diff --git toolkit/moz.configure toolkit/moz.configure | ||||
index 9297e4d6f501..d8e273887e4b 100644 | index 9297e4d6f501..d8e273887e4b 100644 | ||||
--- toolkit/moz.configure | --- toolkit/moz.configure | ||||
+++ toolkit/moz.configure | +++ toolkit/moz.configure | ||||
@@ -1065,6 +1065,26 @@ add_old_configure_assignment('FT2_LIBS', | @@ -1065,6 +1065,26 @@ add_old_configure_assignment('FT2_LIBS', | ||||
add_old_configure_assignment('FT2_CFLAGS', | add_old_configure_assignment('FT2_CFLAGS', | ||||
ft2_info.cflags) | ft2_info.cflags) | ||||
Show All 24 Lines |