diff -ruN scim-1.4.5.org/extras/gtk2_immodule/Makefile.am scim-1.4.5/extras/gtk2_immodule/Makefile.am
--- scim-1.4.5.org/extras/gtk2_immodule/Makefile.am	2006-12-22 14:14:56.452586000 +0900
+++ scim-1.4.5/extras/gtk2_immodule/Makefile.am	2006-12-22 14:14:27.363811000 +0900
@@ -44,6 +44,7 @@
 im_scim_la_LDFLAGS = -rpath $(moduledir) \
 		     -avoid-version \
 		     -module \
+		     -lCstd \
 		     $(LD_VERSION_SCRIPT_OPTION) \
 		     @GTK2_LIBS@
 
diff -ruN scim-1.4.5.org/extras/panel/scim_panel_gtk.cpp scim-1.4.5/extras/panel/scim_panel_gtk.cpp
--- scim-1.4.5.org/extras/panel/scim_panel_gtk.cpp	2006-09-30 16:40:15.000000000 +0900
+++ scim-1.4.5/extras/panel/scim_panel_gtk.cpp	2006-12-22 14:14:27.366628000 +0900
@@ -193,7 +193,7 @@
 static GtkWidget* ui_create_left_icon                  (void);
 static GtkWidget* ui_create_right_icon                 (void);
 
-static GtkWidget* ui_create_factory_menu_entry         (const PanelFactoryInfo &info,
+static void ui_create_factory_menu_entry         (const PanelFactoryInfo &info,
                                                         int                    id,
                                                         GtkMenuShell           *menu,
                                                         bool                   show_lang,
@@ -1517,7 +1517,7 @@
                            LOOKUP_ICON_SIZE);
 }
 
-static GtkWidget*
+static void
 ui_create_factory_menu_entry (const PanelFactoryInfo &info,
                               gint                   id,
                               GtkMenuShell           *menu,
diff -ruN scim-1.4.5.org/extras/setup/Makefile.am scim-1.4.5/extras/setup/Makefile.am
--- scim-1.4.5.org/extras/setup/Makefile.am	2006-12-22 14:14:56.453488000 +0900
+++ scim-1.4.5/extras/setup/Makefile.am	2006-12-22 14:14:27.367456000 +0900
@@ -55,6 +55,7 @@
 setup_la_LDFLAGS	= -avoid-version \
 		     	  -rpath $(moduledir) \
 			  -module \
+			  -lCstd \
 			  @LIBTOOL_EXPORT_OPTIONS@ \
 			  @GTK2_LIBS@ \
 			  @LTLIBINTL@
diff -ruN scim-1.4.5.org/src/Makefile.am scim-1.4.5/src/Makefile.am
--- scim-1.4.5.org/src/Makefile.am	2006-12-22 14:14:56.454798000 +0900
+++ scim-1.4.5/src/Makefile.am	2006-12-22 14:14:27.368077000 +0900
@@ -134,7 +134,8 @@
 			  $(LD_VERSION_SCRIPT_OPTION) \
 			  @LIBTOOL_EXPORT_OPTIONS@ \
 			  @LIBICONV@ \
-			  @LTLIBINTL@
+			  @LTLIBINTL@ \
+			  -lCstd
 
 libscim_1_0_la_LIBADD	= libltdlc.la
 
diff -ruN scim-1.4.5.org/tests/Makefile.am scim-1.4.5/tests/Makefile.am
--- scim-1.4.5.org/tests/Makefile.am	2006-12-22 14:14:56.466507000 +0900
+++ scim-1.4.5/tests/Makefile.am	2006-12-22 14:14:27.381327000 +0900
@@ -49,6 +49,7 @@
 test_helper_la_LDFLAGS	= -avoid-version \
 		     	  -rpath $(helpermoduledir) \
 			  -module \
+			  -lCstd \
 			  @LIBTOOL_EXPORT_OPTIONS@ \
 			  @GTK2_LIBS@ \
 			  @LTLIBINTL@