--- ./gal/e-paned/Makefile.am	Tue Mar 26 17:42:26 2002
+++ ../gal-0.21/./gal/e-paned/Makefile.am	Wed Nov 27 17:24:51 2002
@@ -5,6 +5,8 @@
 
 noinst_LTLIBRARIES = libepaned.la
 
+libepaned_la_LIBADD = -static
+
 libepaned_la_SOURCES = 		\
 	e-hpaned.c		\
 	e-paned.c		\
--- ./gal/e-paned/Makefile.in	Sun Oct 27 23:58:46 2002
+++ ../gal-0.21/./gal/e-paned/Makefile.in	Wed Nov 27 17:25:01 2002
@@ -184,7 +184,7 @@
 DEFS = @DEFS@ -I. -I$(srcdir) -I../..
 LIBS = @LIBS@
 libepaned_la_LDFLAGS = 
-libepaned_la_LIBADD = 
+libepaned_la_LIBADD = -static
 libepaned_la_OBJECTS =  e-hpaned.lo e-paned.lo e-vpaned.lo
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- ./gal/util/Makefile.am	Thu Apr 18 18:04:48 2002
+++ ../gal-0.21/./gal/util/Makefile.am	Wed Nov 27 17:24:35 2002
@@ -8,6 +8,8 @@
 
 noinst_LTLIBRARIES = libutil.la
 
+libutil_la_LIBADD = -static
+
 libutil_la_SOURCES =	\
 	e-bit-array.c	\
 	e-cache.c	\
--- ./gal/util/Makefile.in	Sun Oct 27 23:58:44 2002
+++ ../gal-0.21/./gal/util/Makefile.in	Wed Nov 27 17:24:41 2002
@@ -203,7 +203,7 @@
 DEFS = @DEFS@ -I. -I$(srcdir) -I../..
 LIBS = @LIBS@
 libutil_la_LDFLAGS = 
-libutil_la_LIBADD = 
+libutil_la_LIBADD = -static
 libutil_la_OBJECTS =  e-bit-array.lo e-cache.lo e-iconv.lo \
 e-sorter-array.lo e-sorter.lo e-text-event-processor-emacs-like.lo \
 e-text-event-processor.lo e-unicode-i18n.lo e-util.lo e-xml-utils.lo
--- ./gal/e-table/Makefile.am	Tue Mar 26 17:40:49 2002
+++ ../gal-0.21/./gal/e-table/Makefile.am	Wed Nov 27 17:24:18 2002
@@ -18,6 +18,8 @@
 
 noinst_LTLIBRARIES = libetable.la
 
+libetable_la_LIBADD = -static
+
 libetable_la_SOURCES = 				\
 	e-cell.c				\
 	e-cell-checkbox.c			\
--- ./gal/e-table/Makefile.in	Sun Oct 27 23:58:46 2002
+++ ../gal-0.21/./gal/e-table/Makefile.in	Wed Nov 27 17:24:24 2002
@@ -329,7 +329,7 @@
 DEFS = @DEFS@ -I. -I$(srcdir) -I../..
 LIBS = @LIBS@
 libetable_la_LDFLAGS = 
-libetable_la_LIBADD = 
+libetable_la_LIBADD = -static
 libetable_la_OBJECTS =  e-cell.lo e-cell-checkbox.lo e-cell-combo.lo \
 e-cell-date.lo e-cell-float.lo e-cell-number.lo e-cell-pixbuf.lo \
 e-cell-popup.lo e-cell-progress.lo e-cell-size.lo e-cell-spin-button.lo \
--- ./gal/widgets/Makefile.am	Mon May  6 17:41:32 2002
+++ ../gal-0.21/./gal/widgets/Makefile.am	Wed Nov 27 17:43:57 2002
@@ -1,5 +1,7 @@
 noinst_LTLIBRARIES = libwidgets.la
 
+libwidgets_la_LIBADD = -static
+
 libwidgets_la_SOURCES = 			\
 	color-group.c				\
 	color-palette.c				\
@@ -96,22 +98,24 @@
 
 noinst_PROGRAMS = test-color test-e-font test-font-loading
 
+$(top_builddir)/gal/widgets/libwidgets.la: libwidgets.la
+
 test_color_SOURCES = \
 	test-color.c
 
 test_color_LDADD = \
-	$(EXTRA_GNOME_LIBS) \
 	$(top_builddir)/gal/widgets/libwidgets.la \
-	$(top_builddir)/gal/util/libutil.la
+	$(top_builddir)/gal/util/libutil.la \
+	$(EXTRA_GNOME_LIBS)
 
 test_e_font_SOURCES = \
 	test-e-font.c test-e-font.h
 
 test_e_font_LDADD = \
-	$(EXTRA_GNOME_LIBS) \
 	$(top_builddir)/gal/widgets/libwidgets.la \
 	$(top_builddir)/gal/unicode/libunicode.la \
 	$(top_builddir)/gal/util/libutil.la \
+	$(EXTRA_GNOME_LIBS) \
 	$(ICONV_LIBS)
 
 test_font_loading_SOURCES = \
@@ -118,10 +122,10 @@
 	test-font-loading.c
 
 test_font_loading_LDADD = \
-	$(EXTRA_GNOME_LIBS) \
 	$(top_builddir)/gal/widgets/libwidgets.la \
 	$(top_builddir)/gal/unicode/libunicode.la \
 	$(top_builddir)/gal/util/libutil.la \
+	$(EXTRA_GNOME_LIBS) \
 	$(ICONV_LIBS)
 
 dist-hook:
--- ./gal/widgets/Makefile.in	Sun Oct 27 23:58:45 2002
+++ ../gal-0.21/./gal/widgets/Makefile.in	Wed Nov 27 17:44:20 2002
@@ -257,14 +257,16 @@
 
 noinst_PROGRAMS = test-color test-e-font test-font-loading
 
+$(top_builddir)/gal/widgets/libwidgets.la: libwidgets.la
+
 test_color_SOURCES = \
 	test-color.c
 
 
 test_color_LDADD = \
-	$(EXTRA_GNOME_LIBS) \
 	$(top_builddir)/gal/widgets/libwidgets.la \
-	$(top_builddir)/gal/util/libutil.la
+	$(top_builddir)/gal/util/libutil.la \
+	$(EXTRA_GNOME_LIBS)
 
 
 test_e_font_SOURCES = \
@@ -272,10 +274,10 @@
 
 
 test_e_font_LDADD = \
-	$(EXTRA_GNOME_LIBS) \
 	$(top_builddir)/gal/widgets/libwidgets.la \
 	$(top_builddir)/gal/unicode/libunicode.la \
 	$(top_builddir)/gal/util/libutil.la \
+	$(EXTRA_GNOME_LIBS) \
 	$(ICONV_LIBS)
 
 
@@ -284,10 +286,10 @@
 
 
 test_font_loading_LDADD = \
-	$(EXTRA_GNOME_LIBS) \
 	$(top_builddir)/gal/widgets/libwidgets.la \
 	$(top_builddir)/gal/unicode/libunicode.la \
 	$(top_builddir)/gal/util/libutil.la \
+	$(EXTRA_GNOME_LIBS) \
 	$(ICONV_LIBS)
 
 
@@ -302,7 +304,7 @@
 
 DEFS = @DEFS@ -I. -I$(srcdir) -I../..
 LIBS = @LIBS@
-libwidgets_la_LIBADD = 
+libwidgets_la_LIBADD = -static
 libwidgets_la_OBJECTS =  color-group.lo color-palette.lo \
 e-canvas-background.lo e-canvas-utils.lo e-canvas-vbox.lo e-canvas.lo \
 e-categories-master-list-array.lo e-categories-master-list-combo.lo \
--- ./gal/unicode/Makefile.am	Tue Mar 26 17:42:26 2002
+++ ../gal-0.21/./gal/unicode/Makefile.am	Wed Nov 27 17:23:31 2002
@@ -1,5 +1,7 @@
 noinst_LTLIBRARIES = libunicode.la
 
+libunicode_la_LIBADD = -static
+
 libunicode_la_SOURCES = 		\
 	gunibreak.c			\
 	gunicollate.c			\
--- ./gal/unicode/Makefile.in	Sun Oct 27 23:58:45 2002
+++ ../gal-0.21/./gal/unicode/Makefile.in	Wed Nov 27 17:23:38 2002
@@ -191,7 +191,7 @@
 DEFS = @DEFS@ -I. -I$(srcdir) -I../..
 LIBS = @LIBS@
 libunicode_la_LDFLAGS = 
-libunicode_la_LIBADD = 
+libunicode_la_LIBADD = -static
 libunicode_la_OBJECTS =  gunibreak.lo gunicollate.lo gunidecomp.lo \
 guniprop.lo gutf8.lo
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- ./gal/shortcut-bar/Makefile.am	Tue Mar 26 17:41:13 2002
+++ ../gal-0.21/./gal/shortcut-bar/Makefile.am	Wed Nov 27 17:23:06 2002
@@ -6,6 +6,8 @@
 
 noinst_LTLIBRARIES = libshortcut-bar.la
 
+libshortcut_bar_la_LIBADD = -static
+
 libshortcut_bar_la_SOURCES = 	\
 	e-group-bar.c		\
 	e-icon-bar-bg-item.c	\
--- ./gal/shortcut-bar/Makefile.in	Sun Oct 27 23:58:47 2002
+++ ../gal-0.21/./gal/shortcut-bar/Makefile.in	Wed Nov 27 17:23:13 2002
@@ -191,7 +191,7 @@
 DEFS = @DEFS@ -I. -I$(srcdir) -I../..
 LIBS = @LIBS@
 libshortcut_bar_la_LDFLAGS = 
-libshortcut_bar_la_LIBADD = 
+libshortcut_bar_la_LIBADD = -static
 libshortcut_bar_la_OBJECTS =  e-group-bar.lo e-icon-bar-bg-item.lo \
 e-icon-bar.lo e-shortcut-bar.lo e-shortcut-model.lo e-vscrolled-bar.lo
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- ./gal/menus/Makefile.am	Tue Mar 26 17:41:33 2002
+++ ../gal-0.21/./gal/menus/Makefile.am	Wed Nov 27 17:22:43 2002
@@ -15,6 +15,8 @@
 
 noinst_LTLIBRARIES = libgalmenus.la
 
+libgalmenus_la_LIBADD = -static
+
 libgalmenus_la_SOURCES = 			\
 	gal-define-views-dialog.c		\
 	gal-define-views-model.c		\
--- ./gal/menus/Makefile.in	Sun Oct 27 23:58:47 2002
+++ ../gal-0.21/./gal/menus/Makefile.in	Wed Nov 27 17:22:54 2002
@@ -216,7 +216,7 @@
 DEFS = @DEFS@ -I. -I$(srcdir) -I../..
 LIBS = @LIBS@
 libgalmenus_la_LDFLAGS = 
-libgalmenus_la_LIBADD = 
+libgalmenus_la_LIBADD = -static
 libgalmenus_la_OBJECTS =  gal-define-views-dialog.lo \
 gal-define-views-model.lo gal-view-collection.lo gal-view-etable.lo \
 gal-view-factory-etable.lo gal-view-factory.lo \
--- ./gal/menus/gal-view-collection.c	Tue Jun  4 08:19:33 2002
+++ ../gal-0.21/./gal/menus/gal-view-collection.c	Wed Nov 27 16:04:14 2002
@@ -41,7 +41,7 @@
 
 static GtkObjectClass *gal_view_collection_parent_class;
 
-#define d(x) x
+#define d(x)
 
 enum {
 	DISPLAY_VIEW,
--- ./gal/menus/gal-view-instance.c	Mon Apr 22 17:46:57 2002
+++ ../gal-0.21/./gal/menus/gal-view-instance.c	Wed Nov 27 16:44:47 2002
@@ -51,7 +51,7 @@
 static const EPopupMenu terminator = E_POPUP_TERMINATOR;
 
 
-#define d(x) x
+#define d(x)
 
 enum {
 	DISPLAY_VIEW,
@@ -509,6 +509,7 @@
 		      gpointer closure,
 		      gboolean value)
 {
+#ifdef __GNUC__
 	const EPopupMenu menu_item_struct = 
 		E_POPUP_RADIO_ITEM_CC (title,
 				       fn,
@@ -515,6 +516,15 @@
 				       closure,
 				       0,
 				       value);
+#else
+	EPopupMenu menu_item_struct =
+		E_POPUP_RADIO_ITEM_CC (NULL, NULL, NULL, 0, 0);
+	menu_item_struct.name = title;
+	menu_item_struct.fn = fn;
+	menu_item_struct.disable_mask = 0;
+	menu_item_struct.closure = closure;
+	menu_item_struct.is_active = value;
+#endif
 
 	e_popup_menu_copy_1 (menu_item, &menu_item_struct);
 }
@@ -525,11 +535,20 @@
 		     void (*fn) (GtkWidget *widget, gpointer closure),
 		     gpointer closure)
 {
+#ifdef __GNUC__
 	const EPopupMenu menu_item_struct = 
 		E_POPUP_ITEM_CC (title,
 				 fn,
 				 closure,
 				 0);
+#else
+	EPopupMenu menu_item_struct =
+		E_POPUP_ITEM_CC (NULL, NULL, NULL, 0);
+	menu_item_struct.name = title;
+	menu_item_struct.fn = fn;
+	menu_item_struct.disable_mask = 0;
+	menu_item_struct.closure = closure;
+#endif
 
 	e_popup_menu_copy_1 (menu_item, &menu_item_struct);
 }
--- ./gal/e-text/Makefile.am	Mon Oct 21 11:56:10 2002
+++ ../gal-0.21/./gal/e-text/Makefile.am	Wed Nov 27 17:42:38 2002
@@ -7,6 +7,8 @@
 
 noinst_LTLIBRARIES = libetext.la
 
+libetext_la_LIBADD = -static
+
 libetext_la_SOURCES = 		\
 	e-entry.c				\
 	e-completion-match.c			\
@@ -45,10 +47,10 @@
 
 #e_text_test_LDADD =				\
 #	 libetext.la				\
-#	 $(EXTRA_GNOME_LIBS)			\
 #	 $(top_builddir)/gal/widgets/libwidgets.la \
 #	 $(top_builddir)/gal/unicode/libunicode.la \
-#	 $(top_builddir)/gal/util/libutil.la
+#	 $(top_builddir)/gal/util/libutil.la	\
+#	 $(EXTRA_GNOME_LIBS)
 
 #e_entry_test_SOURCES =	\
 #	 e-entry-test.c
@@ -55,11 +57,11 @@
 
 #e_entry_test_LDADD =				\
 #	 libetext.la				\
-#	 $(EXTRA_GNOME_LIBS)			\
 #	 $(top_builddir)/gal/e-table/libetable.la \
 #	 $(top_builddir)/gal/widgets/libwidgets.la \
 #	 $(top_builddir)/gal/unicode/libunicode.la \
-#	 $(top_builddir)/gal/util/libutil.la
+#	 $(top_builddir)/gal/util/libutil.la	\
+#	 $(EXTRA_GNOME_LIBS)
 
 #e_text_model_test_SOURCES = \
 #	e-text-model-test.c
@@ -66,10 +68,10 @@
 
 #e_text_model_test_LDADD = \
 #	libetext.la 		\
-#	$(EXTRA_GNOME_LIBS)	\
 #	 $(top_builddir)/gal/widgets/libwidgets.la \
 #	 $(top_builddir)/gal/unicode/libunicode.la \
-#	 $(top_builddir)/gal/util/libutil.la
+#	 $(top_builddir)/gal/util/libutil.la	\
+#	$(EXTRA_GNOME_LIBS)
 
 e_completion_test_SOURCES = \
 	e-completion-test.c
@@ -77,8 +79,8 @@
 e_completion_test_LDADD = \
 	libetext.la 		\
 	$(top_builddir)/gal/e-table/libetable.la \
-	$(EXTRA_GNOME_LIBS)	\
 	$(top_builddir)/gal/widgets/libwidgets.la \
 	$(top_builddir)/gal/util/libutil.la \
 	$(top_builddir)/gal/unicode/libunicode.la \
+	$(EXTRA_GNOME_LIBS)	\
 	$(ICONV_LIBS)
--- ./gal/e-text/Makefile.in	Sun Oct 27 23:58:47 2002
+++ ../gal-0.21/./gal/e-text/Makefile.in	Wed Nov 27 17:43:33 2002
@@ -203,10 +203,10 @@
 
 #e_text_test_LDADD =				\
 #	 libetext.la				\
-#	 $(EXTRA_GNOME_LIBS)			\
 #	 $(top_builddir)/gal/widgets/libwidgets.la \
 #	 $(top_builddir)/gal/unicode/libunicode.la \
-#	 $(top_builddir)/gal/util/libutil.la
+#	 $(top_builddir)/gal/util/libutil.la	\
+#	 $(EXTRA_GNOME_LIBS)
 
 #e_entry_test_SOURCES =	\
 #	 e-entry-test.c
@@ -213,11 +213,11 @@
 
 #e_entry_test_LDADD =				\
 #	 libetext.la				\
-#	 $(EXTRA_GNOME_LIBS)			\
 #	 $(top_builddir)/gal/e-table/libetable.la \
 #	 $(top_builddir)/gal/widgets/libwidgets.la \
 #	 $(top_builddir)/gal/unicode/libunicode.la \
-#	 $(top_builddir)/gal/util/libutil.la
+#	 $(top_builddir)/gal/util/libutil.la	\
+#	 $(EXTRA_GNOME_LIBS)
 
 #e_text_model_test_SOURCES = \
 #	e-text-model-test.c
@@ -224,10 +224,10 @@
 
 #e_text_model_test_LDADD = \
 #	libetext.la 		\
-#	$(EXTRA_GNOME_LIBS)	\
 #	 $(top_builddir)/gal/widgets/libwidgets.la \
 #	 $(top_builddir)/gal/unicode/libunicode.la \
-#	 $(top_builddir)/gal/util/libutil.la
+#	 $(top_builddir)/gal/util/libutil.la	\
+#	$(EXTRA_GNOME_LIBS)
 
 e_completion_test_SOURCES = \
 	e-completion-test.c
@@ -236,10 +236,10 @@
 e_completion_test_LDADD = \
 	libetext.la 		\
 	$(top_builddir)/gal/e-table/libetable.la \
-	$(EXTRA_GNOME_LIBS)	\
 	$(top_builddir)/gal/widgets/libwidgets.la \
 	$(top_builddir)/gal/util/libutil.la \
 	$(top_builddir)/gal/unicode/libunicode.la \
+	$(EXTRA_GNOME_LIBS)	\
 	$(ICONV_LIBS)
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -251,7 +251,7 @@
 DEFS = @DEFS@ -I. -I$(srcdir) -I../..
 LIBS = @LIBS@
 libetext_la_LDFLAGS = 
-libetext_la_LIBADD = 
+libetext_la_LIBADD = -static
 libetext_la_OBJECTS =  e-entry.lo e-completion-match.lo e-completion.lo \
 e-completion-view.lo e-table-text-model.lo e-text-model-repos.lo \
 e-text-model.lo e-text-model-uri.lo e-text.lo
--- ./ltmain.sh	Sun Oct 27 23:58:15 2002
+++ ../gal-0.21/./ltmain.sh	Wed Nov 27 14:59:19 2002
@@ -61,7 +61,7 @@
 default_mode=
 help="Try \`$progname --help' for more information."
 magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
+mkdir="mkdir -p"
 mv="mv -f"
 rm="rm -f"
 
--- ./configure	Sun Oct 27 23:58:17 2002
+++ ../gal-0.21/./configure	Wed Nov 27 15:01:23 2002
@@ -703,7 +703,7 @@
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS conftest.$ac_ext $LDFLAGS $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
 ac_exeext=
@@ -1192,7 +1192,7 @@
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS conftest.$ac_ext $LDFLAGS $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
@@ -1220,7 +1220,7 @@
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS conftest.$ac_ext $LDFLAGS $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
@@ -2851,7 +2851,7 @@
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS conftest.$ac_ext $LDFLAGS $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
      cat > conftest.$ac_ext <<EOF
@@ -2876,7 +2876,7 @@
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS conftest.$ac_ext $LDFLAGS $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
 fi