>>>> "William" == William M Perry
<wmperry(a)gnu.org> writes:
William> I will leave it up to someone else to actually commit this.
May I humbly ask that someone please check in the middle part of William's
patch to configure.in (the whole patch is included below) even if no action is
taken on the rest.
The reason is that GTK builds on the 21.5 head are now broken because
toolbar-gtk.c now depends on toolbar-common.c which isn't built without that
part of the patch. (Tested with a just updated copy of the 21.5 head.)
Thanks,
Malcolm
Index: configure.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.in,v
retrieving revision 1.169
diff -u -w -u -w -r1.169 configure.in
--- configure.in 2001/12/20 06:08:17 1.169
+++ configure.in 2001/12/24 11:45:12
@@ -2616,6 +2616,9 @@
AC_MSG_CHECKING(gtk cflags)
GTK_CFLAGS=`${GTK_CONFIG} --cflags`
+ if test "$GCC" = "yes"; then
+ GTK_CFLAGS="${GTK_CFLAGS} -Wno-shadow"
+ fi
XE_APPEND(${GTK_CFLAGS}, c_switch_gtk)
AC_MSG_RESULT(${GTK_CFLAGS})
@@ -3604,7 +3607,7 @@
test "$with_menubars" != "no" &&
XE_ADD_OBJS(menubar-gtk.o)
test "$with_scrollbars" != "no" &&
XE_ADD_OBJS(scrollbar-gtk.o)
test "$with_dialogs" != "no" &&
XE_ADD_OBJS(dialog-gtk.o)
- test "$with_toolbars" != "no" &&
XE_ADD_OBJS(toolbar-gtk.o)
+ test "$with_toolbars" != "no" &&
XE_ADD_OBJS(toolbar-common.o toolbar-gtk.o)
test "$all_widgets" != "no no no no no" &&
XE_ADD_OBJS(gui-gtk.o)
fi
@@ -3612,7 +3615,7 @@
test "$with_menubars" != "no" &&
XE_ADD_OBJS(menubar-x.o)
test "$with_scrollbars" != "no" &&
XE_ADD_OBJS(scrollbar-x.o)
test "$with_dialogs" != "no" &&
XE_ADD_OBJS(dialog-x.o)
- test "$with_toolbars" != "no" &&
XE_ADD_OBJS(toolbar-x.o)
+ test "$with_toolbars" != "no" &&
XE_ADD_OBJS(toolbar-common.o toolbar-x.o)
test "$all_widgets" != "no no no no no" &&
XE_ADD_OBJS(gui-x.o)
fi