Bye bye gtk1 and xlib (Patch 2).
b=326152 r+sr=roc
--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -156,17 +156,16 @@ gfx/public/Makefile
gfx/src/Makefile
gfx/src/beos/Makefile
gfx/src/gtk/Makefile
gfx/src/ps/Makefile
gfx/src/psshared/Makefile
gfx/src/photon/Makefile
gfx/src/mac/Makefile
gfx/src/qt/Makefile
-gfx/src/xlib/Makefile
gfx/src/os2/Makefile
gfx/src/xlibrgb/Makefile
gfx/src/windows/Makefile
gfx/src/thebes/Makefile
gfx/tests/Makefile
"
if [ "$MOZ_TREE_CAIRO" ] ; then
@@ -567,27 +566,23 @@ webshell/public/Makefile
"
MAKEFILES_widget="
widget/Makefile
widget/public/Makefile
widget/src/Makefile
widget/src/beos/Makefile
widget/src/build/Makefile
-widget/src/gtk/Makefile
-widget/src/gtksuperwin/Makefile
widget/src/gtkxtbin/Makefile
widget/src/qt/Makefile
widget/src/photon/Makefile
widget/src/mac/Makefile
widget/src/cocoa/Makefile
-widget/src/xlib/Makefile
widget/src/os2/Makefile
widget/src/windows/Makefile
-widget/src/xlibxtbin/Makefile
widget/src/xpwidgets/Makefile
widget/src/support/Makefile
"
MAKEFILES_xpcom="
xpcom/string/Makefile
xpcom/string/public/Makefile
xpcom/string/src/Makefile
--- a/configure.in
+++ b/configure.in
@@ -4533,26 +4533,25 @@ MOZ_ARG_HEADER(Toolkit Options)
[ _DEFAULT_TOOLKIT=$_PLATFORM_DEFAULT_TOOLKIT])
if test "$_DEFAULT_TOOLKIT" = "qt" \
-o "$_DEFAULT_TOOLKIT" = "photon" \
-o "$_DEFAULT_TOOLKIT" = "cairo-windows" \
-o "$_DEFAULT_TOOLKIT" = "cairo-gtk2" \
-o "$_DEFAULT_TOOLKIT" = "cairo-beos" \
-o "$_DEFAULT_TOOLKIT" = "cairo-os2" \
- -o "$_DEFAULT_TOOLKIT" = "cairo-xlib" \
-o "$_DEFAULT_TOOLKIT" = "cairo-mac" \
-o "$_DEFAULT_TOOLKIT" = "cairo-cocoa"
then
dnl nglayout only supports building with one toolkit,
dnl so ignore everything after the first comma (",").
MOZ_WIDGET_TOOLKIT=`echo "$_DEFAULT_TOOLKIT" | sed -e "s/,.*$//"`
else
if test "$no_x" != "yes"; then
- AC_MSG_ERROR([Toolkit must be cairo-xlib, cairo-gtk2, or qt.])
+ AC_MSG_ERROR([Toolkit must be cairo-gtk2 or qt.])
else
AC_MSG_ERROR([Toolkit must be $_PLATFORM_DEFAULT_TOOLKIT (if supported).])
fi
fi
AC_DEFINE_UNQUOTED(MOZ_DEFAULT_TOOLKIT,"$MOZ_WIDGET_TOOLKIT")
dnl ========================================================