From 5a5c95944ce9de319d631875d73f36adcf9e5ef1 Mon Sep 17 00:00:00 2001 From: "jshin%mailaps.org" Date: Tue, 4 Mar 2003 02:20:40 +0000 Subject: [PATCH] bug 180851 ; remove unnnecessary converters (1i8n/uconv) for non-X11 builds. configure.in checked in previously had a flaw and this is to fix it up. (r=cls) --- configure.in | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/configure.in b/configure.in index 3ae02646eccc..e334d939ae19 100644 --- a/configure.in +++ b/configure.in @@ -3143,23 +3143,6 @@ then AC_DEFINE(MOZ_X11) fi -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_GTK" || test "$MOZ_ENABLE_GTK2") \ -&& test "$MOZ_ENABLE_COREXFONTS" \ -|| test "$MOZ_ENABLE_XLIB" \ -|| test "$MOZ_ENABLE_XPRINT" -then - AC_DEFINE(MOZ_EXTRA_X11CONVERTERS) - MOZ_EXTRA_X11CONVERTERS=1 -fi -AC_SUBST(MOZ_EXTRA_X11CONVERTERS) dnl ======================================================== dnl = @@ -3283,6 +3266,24 @@ then MOZ_ENABLE_XPRINT=1 ) fi +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_GTK" || test "$MOZ_ENABLE_GTK2") \ +&& test "$MOZ_ENABLE_COREXFONTS" \ +|| test "$MOZ_ENABLE_XLIB" \ +|| test "$MOZ_ENABLE_XPRINT" +then + AC_DEFINE(MOZ_EXTRA_X11CONVERTERS) + MOZ_EXTRA_X11CONVERTERS=1 +fi +AC_SUBST(MOZ_EXTRA_X11CONVERTERS) + dnl ======================================================== dnl = Build Personal Security Manager dnl ========================================================