зеркало из https://github.com/mozilla/pjs.git
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)
This commit is contained in:
Родитель
176b88a50a
Коммит
a59b4058a4
35
configure.in
35
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 ========================================================
|
||||
|
|
Загрузка…
Ссылка в новой задаче