Bug 1344038 - Remove --enable-gnomeui. r=karlt

--HG--
extra : rebase_source : 562519f2f6727750afe7d4a8503b41e722222d7d
This commit is contained in:
Mike Hommey 2017-03-08 15:35:53 +09:00
parent 94c16743bb
commit e91179eda5
3 changed files with 1 additions and 38 deletions

View File

@ -179,7 +179,6 @@ def old_configure_options(*options):
'--enable-gamepad',
'--enable-gconf',
'--enable-gczeal',
'--enable-gnomeui',
'--enable-gold',
'--enable-hardware-aec-ns',
'--enable-icf',

View File

@ -10,7 +10,4 @@ SOURCES += [
FINAL_LIBRARY = 'xul'
if CONFIG['MOZ_ENABLE_GNOMEUI']:
CXXFLAGS += CONFIG['MOZ_GNOMEUI_CFLAGS']
else:
CXXFLAGS += CONFIG['TK_CFLAGS']
CXXFLAGS += CONFIG['TK_CFLAGS']

View File

@ -63,7 +63,6 @@ GTK3_VERSION=3.4.0
GDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_4
WINDRES_VERSION=2.14.90
W32API_VERSION=3.14
GNOMEUI_VERSION=2.2.0
GCONF_VERSION=1.2.1
STARTUP_NOTIFICATION_VERSION=0.8
DBUS_VERSION=0.60
@ -2597,38 +2596,6 @@ then
fi
AC_SUBST(MOZ_ENABLE_LIBPROXY)
dnl ========================================================
dnl = libgnomeui support module
dnl ========================================================
if test "$MOZ_ENABLE_GTK"
then
MOZ_ARG_ENABLE_BOOL(gnomeui,
[ --enable-gnomeui Enable libgnomeui instead of GIO & GTK for icon theme support ],
MOZ_ENABLE_GNOMEUI=force,
MOZ_ENABLE_GNOMEUI=)
if test "$MOZ_ENABLE_GNOMEUI"
then
PKG_CHECK_MODULES(MOZ_GNOMEUI, libgnomeui-2.0 >= $GNOMEUI_VERSION,
[
MOZ_ENABLE_GNOMEUI=1
],[
if test "$MOZ_ENABLE_GNOMEUI" = "force"
then
AC_MSG_ERROR([* * * Could not find libgnomeui-2.0 >= $GNOMEUI_VERSION])
fi
MOZ_ENABLE_GNOMEUI=
])
fi
if test "$MOZ_ENABLE_GNOMEUI"; then
AC_DEFINE(MOZ_ENABLE_GNOMEUI)
fi
fi
AC_SUBST(MOZ_ENABLE_GNOMEUI)
dnl ========================================================
dnl = dbus support
dnl ========================================================