Bug 553964 - Port |Bug 550468 - Fix support for Pango font engine on Qt platform| to comm-central; (Av1) Port (the useful part of) it, Restore (now) useful MOZ_PANGO support.
authorSerge Gautherie <sgautherie.bz@free.fr>
Mon, 22 Mar 2010 15:07:45 +0100
changeset 5230 43e37e9ac45235866db09b911e1e775dadbc92d5
parent 5229 f0b251ece684ad6680987b582de728d6725469fa
child 5231 119eba2ab71985beb886d3fda65c49398c7f2c66
push id4038
push usersgautherie.bz@free.fr
push dateMon, 22 Mar 2010 14:09:18 +0000
treeherdercomm-central@43e37e9ac452 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs553964, 550468
Bug 553964 - Port |Bug 550468 - Fix support for Pango font engine on Qt platform| to comm-central; (Av1) Port (the useful part of) it, Restore (now) useful MOZ_PANGO support. r=Callek.
configure.in
--- a/configure.in
+++ b/configure.in
@@ -4517,16 +4517,19 @@ MOZ_MORK=1
 MOZ_MORKREADER=
 MOZ_AUTH_EXTENSION=1
 MOZ_NO_ACTIVEX_SUPPORT=1
 MOZ_NO_INSPECTOR_APIS=
 MOZ_NO_FAST_LOAD=
 MOZ_OGG=1
 MOZ_SYDNEYAUDIO=
 MOZ_WAVE=1
+if test "$MOZILLA_1_9_2_BRANCH" != "1"; then
+MOZ_PANGO=1
+fi
 MOZ_PERMISSIONS=1
 MOZ_PLACES=
 MOZ_PLAINTEXT_EDITOR_ONLY=
 MOZ_PLUGINS=1
 MOZ_PREF_EXTENSIONS=1
 MOZ_PROFILELOCKING=1
 MOZ_PSM=1
 MOZ_RDF=1
@@ -5046,25 +5049,52 @@ 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)
 
+if test "$MOZILLA_1_9_2_BRANCH" != "1"; then
+dnl ========================================================
+dnl complex text support off by default
+dnl ========================================================
+MOZ_ARG_DISABLE_BOOL(pango,
+[  --disable-pango Disable usage of Pango ],
+    MOZ_PANGO=,
+    MOZ_PANGO=1)
+fi # ! MOZILLA_1_9_2_BRANCH
+
 dnl ========================================================
 dnl = Pango
 dnl ========================================================
 if test "$MOZ_ENABLE_GTK2"
 then
     PKG_CHECK_MODULES(MOZ_PANGO, pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION)
     AC_SUBST(MOZ_PANGO_LIBS)
 fi
 
+if test "$MOZILLA_1_9_2_BRANCH" != "1"; then
+if test "$MOZ_ENABLE_QT"
+then
+    if test "$MOZ_PANGO"
+    then
+        PKG_CHECK_MODULES(MOZ_PANGO, [pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION],
+        [
+            AC_SUBST(MOZ_PANGO_LIBS)
+        ],
+        [
+            echo "Pango library not found, will use FT2 font engine"
+            MOZ_PANGO=
+        ])
+    fi
+fi
+fi # ! MOZILLA_1_9_2_BRANCH
+
 dnl ========================================================
 dnl = GnomeVFS support module
 dnl ========================================================
 
 if test "$MOZ_X11"
 then
     dnl build the gnomevfs extension by default only when the
     dnl GTK2 toolkit is in use.