Commit 51d8738e authored by Serge Gautherie's avatar Serge Gautherie
Browse files

Bug 513602 - Remove (now) useless MOZ_GFX_TOOLKIT; (Bv1-MC) Just remove it

r=vladimir
parent f62bb24c
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ XULRUNNER_STUB_NAME = @XULRUNNER_STUB_NAME@
MOZ_CHROME_FILE_FORMAT	= @MOZ_CHROME_FILE_FORMAT@

MOZ_WIDGET_TOOLKIT	= @MOZ_WIDGET_TOOLKIT@
MOZ_GFX_TOOLKIT		= @MOZ_GFX_TOOLKIT@
MOZ_GFX_OPTIMIZE_MOBILE = @MOZ_GFX_OPTIMIZE_MOBILE@

MOZ_DFB			= @MOZ_DFB@
+0 −9
Original line number Diff line number Diff line
@@ -1078,7 +1078,6 @@ MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom_compat'
USE_DEPENDENT_LIBS=1

_PLATFORM_DEFAULT_TOOLKIT=cairo-gtk2
MOZ_GFX_TOOLKIT='$(MOZ_WIDGET_TOOLKIT)'

MOZ_ENABLE_POSTSCRIPT=1 

@@ -4822,12 +4821,10 @@ photon)

cairo-windows)
    MOZ_WIDGET_TOOLKIT=windows
    MOZ_GFX_TOOLKIT=cairo
    ;;

cairo-gtk2|cairo-gtk2-x11)
    MOZ_WIDGET_TOOLKIT=gtk2
    MOZ_GFX_TOOLKIT=cairo
    MOZ_ENABLE_GTK2=1
    MOZ_ENABLE_XREMOTE=1

@@ -4841,7 +4838,6 @@ cairo-gtk2|cairo-gtk2-x11)

cairo-gtk2-dfb)
    MOZ_WIDGET_TOOLKIT=gtk2
    MOZ_GFX_TOOLKIT=cairo
    MOZ_ENABLE_GTK2=1

    AC_DEFINE(MOZ_DFB)
@@ -4858,7 +4854,6 @@ cairo-gtk2-dfb)

cairo-qt)
    MOZ_WIDGET_TOOLKIT=qt
    MOZ_GFX_TOOLKIT=cairo
    MOZ_ENABLE_QT=1
    MOZ_ENABLE_XREMOTE=1
    USE_ELF_DYNSTR_GC=
@@ -4874,14 +4869,12 @@ cairo-qt)

cairo-beos)
    MOZ_WIDGET_TOOLKIT=beos
    MOZ_GFX_TOOLKIT=cairo
    TK_CFLAGS='$(MOZ_CAIRO_CFLAGS)'
    TK_LIBS='$(MOZ_CAIRO_LIBS)'
    ;;

cairo-os2)
    MOZ_WIDGET_TOOLKIT=os2
    MOZ_GFX_TOOLKIT=cairo
    TK_CFLAGS='$(MOZ_CAIRO_CFLAGS)'
    TK_LIBS='$(MOZ_CAIRO_LIBS)'
    ;;
@@ -4890,7 +4883,6 @@ cairo-cocoa)
    MOZ_WIDGET_TOOLKIT=cocoa
    AC_DEFINE(MOZ_WIDGET_COCOA)
    MOZ_ENABLE_COCOA=1
    MOZ_GFX_TOOLKIT=cairo
    MOZ_USER_DIR="Mozilla"
    AC_DEFINE(XP_MACOSX)
    AC_DEFINE(TARGET_CARBON)
@@ -7959,7 +7951,6 @@ AC_SUBST(FILTER)
AC_SUBST(BIN_FLAGS)
AC_SUBST(NS_USE_NATIVE)
AC_SUBST(MOZ_WIDGET_TOOLKIT)
AC_SUBST(MOZ_GFX_TOOLKIT)
AC_SUBST(MOZ_UPDATE_XTERM)
AC_SUBST(MINIMO)
AC_SUBST(MOZ_PLATFORM_HILDON)
+0 −1
Original line number Diff line number Diff line
@@ -882,7 +882,6 @@ MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom_compat'
USE_DEPENDENT_LIBS=1

_PLATFORM_DEFAULT_TOOLKIT=cairo-gtk2
MOZ_GFX_TOOLKIT='$(MOZ_WIDGET_TOOLKIT)'

MOZ_ENABLE_POSTSCRIPT=1