Index: bootstrap
===================================================================
RCS file: /cvsroot/scim/scim/bootstrap,v
retrieving revision 1.7
diff -u -p -r1.7 bootstrap
--- bootstrap	7 Mar 2005 04:25:24 -0000	1.7
+++ bootstrap	21 Aug 2006 10:03:37 -0000
@@ -20,7 +20,7 @@
 #! /bin/sh
 
 set -x
-aclocal -I m4
+aclocal -I m4 $ACLOCAL_FLAGS
 autoheader
 libtoolize -c --automake 
 automake --add-missing --copy --include-deps
Index: extras/gtk2_immodule/Makefile.am
===================================================================
RCS file: /cvsroot/scim/scim/extras/gtk2_immodule/Makefile.am,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile.am
--- extras/gtk2_immodule/Makefile.am	10 Jul 2005 13:45:36 -0000	1.27
+++ extras/gtk2_immodule/Makefile.am	21 Aug 2006 10:03:37 -0000
@@ -44,7 +44,6 @@ im_scim_la_CFLAGS  =@GTK2_CFLAGS@
 im_scim_la_LDFLAGS = -rpath $(moduledir) \
 		     -avoid-version \
 		     -module \
-		     -lstdc++ \
 		     $(LD_VERSION_SCRIPT_OPTION) \
 		     @GTK2_LIBS@
 
Index: extras/setup/Makefile.am
===================================================================
RCS file: /cvsroot/scim/scim/extras/setup/Makefile.am,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile.am
--- extras/setup/Makefile.am	10 Jul 2005 13:45:37 -0000	1.12
+++ extras/setup/Makefile.am	21 Aug 2006 10:03:37 -0000
@@ -55,7 +55,6 @@ setup_la_CXXFLAGS	= @GTK2_CFLAGS@
 setup_la_LDFLAGS	= -avoid-version \
 		     	  -rpath $(moduledir) \
 			  -module \
-			  -lstdc++ \
 			  @LIBTOOL_EXPORT_OPTIONS@ \
 			  @GTK2_LIBS@ \
 			  @LTLIBINTL@
Index: src/Makefile.am
===================================================================
RCS file: /cvsroot/scim/scim/src/Makefile.am,v
retrieving revision 1.55
diff -u -p -r1.55 Makefile.am
--- src/Makefile.am	10 Jul 2005 13:45:39 -0000	1.55
+++ src/Makefile.am	21 Aug 2006 10:03:37 -0000
@@ -134,8 +134,7 @@ libscim_1_0_la_LDFLAGS	= -version-info $
 			  $(LD_VERSION_SCRIPT_OPTION) \
 			  @LIBTOOL_EXPORT_OPTIONS@ \
 			  @LIBICONV@ \
-			  @LTLIBINTL@ \
-			  -lstdc++
+			  @LTLIBINTL@
 
 libscim_1_0_la_LIBADD	= libltdlc.la
 
Index: src/ltdl.cpp
===================================================================
RCS file: /cvsroot/scim/scim/src/ltdl.cpp,v
retrieving revision 1.2
diff -u -p -r1.2 ltdl.cpp
--- src/ltdl.cpp	13 Aug 2004 00:02:39 -0000	1.2
+++ src/ltdl.cpp	21 Aug 2006 10:03:38 -0000
@@ -3372,7 +3372,7 @@ lt_dlopenext (
   assert (filename);
 
   len = LT_STRLEN (filename);
-  ext = strrchr (filename, '.');
+  ext = strrchr ((char*)filename, '.');
 
   /* If FILENAME already bears a suitable extension, there is no need
      to try appending additional extensions.  */
Index: src/scim.h
===================================================================
RCS file: /cvsroot/scim/scim/src/scim.h,v
retrieving revision 1.38
diff -u -p -r1.38 scim.h
--- src/scim.h	17 May 2005 06:45:14 -0000	1.38
+++ src/scim.h	21 Aug 2006 10:03:38 -0000
@@ -298,14 +298,14 @@
     #include <scim_global_config.h>
 #endif
 
-#ifdef Uses_SCIM_OBJECT
-    #include <scim_object.h>
-#endif
-
 #ifdef Uses_SCIM_POINTER
     #include <scim_pointer.h>
 #endif
 
+#ifdef Uses_SCIM_OBJECT
+    #include <scim_object.h>
+#endif
+
 #ifdef Uses_SCIM_SLOT
     #include <scim_slot.h>
 #endif
Index: src/scim_pointer.h
===================================================================
RCS file: /cvsroot/scim/scim/src/scim_pointer.h,v
retrieving revision 1.11
diff -u -p -r1.11 scim_pointer.h
--- src/scim_pointer.h	10 Jan 2005 08:30:54 -0000	1.11
+++ src/scim_pointer.h	21 Aug 2006 10:03:38 -0000
@@ -84,7 +84,7 @@ public:
     //!<
     //!< <BR>Initialize a new Pointer with any dumb pointer.
 
-    Pointer(Pointer& src) : t(0)
+    Pointer(const Pointer& src) : t(0)
     {
         set(src.get());
     }
Index: src/scim_slot.h
===================================================================
RCS file: /cvsroot/scim/scim/src/scim_slot.h,v
retrieving revision 1.8
diff -u -p -r1.8 scim_slot.h
--- src/scim_slot.h	10 Jan 2005 08:30:54 -0000	1.8
+++ src/scim_slot.h	21 Aug 2006 10:03:39 -0000
@@ -149,7 +149,7 @@ public:
 
 template <typename T1, typename T2, typename R>
 inline Slot0<R>*
-slot(T1* &object, R (T2::*function)())
+slot(T1* object, R (T2::*function)())
 {
     return new MethodSlot0<T2, R>(object, function);
 }
@@ -291,7 +291,7 @@ public:
 
 template <typename T1, typename T2, typename R, typename P1>
 inline Slot1<R, P1>*
-slot(T1* &object, R (T2::*function)(P1))
+slot(T1* object, R (T2::*function)(P1))
 {
     return new MethodSlot1<T2, R, P1>(object, function);
 }
@@ -434,7 +434,7 @@ public:
 
 template <typename T1, typename T2, typename R, typename P1, typename P2>
 inline Slot2<R, P1, P2>*
-slot(T1* &object, R (T2::*function)(P1, P2))
+slot(T1* object, R (T2::*function)(P1, P2))
 {
     return new MethodSlot2<T2, R, P1, P2>(object, function);
 }
@@ -577,7 +577,7 @@ public:
 
 template <typename T1, typename T2, typename R, typename P1, typename P2, typename P3>
 inline Slot3<R, P1, P2, P3>*
-slot(T1* &object, R (T2::*function)(P1, P2, P3))
+slot(T1* object, R (T2::*function)(P1, P2, P3))
 {
     return new MethodSlot3<T2, R, P1, P2, P3>(object, function);
 }
@@ -720,7 +720,7 @@ public:
 
 template <typename T1, typename T2, typename R, typename P1, typename P2, typename P3, typename P4>
 inline Slot4<R, P1, P2, P3, P4>*
-slot(T1* &object, R (T2::*function)(P1, P2, P3, P4))
+slot(T1* object, R (T2::*function)(P1, P2, P3, P4))
 {
     return new MethodSlot4<T2, R, P1, P2, P3, P4>(object, function);
 }
@@ -862,7 +862,7 @@ public:
 
 template <typename T1, typename T2, typename R, typename P1, typename P2, typename P3, typename P4, typename P5>
 inline Slot5<R, P1, P2, P3, P4, P5>*
-slot(T1* &object, R (T2::*function)(P1, P2, P3, P4, P5))
+slot(T1* object, R (T2::*function)(P1, P2, P3, P4, P5))
 {
     return new MethodSlot5<T2, R, P1, P2, P3, P4, P5>(object, function);
 }
@@ -1005,7 +1005,7 @@ public:
 
 template <typename T1, typename T2, typename R, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6>
 inline Slot6<R, P1, P2, P3, P4, P5, P6>*
-slot(T1* &object, R (T2::*function)(P1, P2, P3, P4, P5, P6))
+slot(T1* object, R (T2::*function)(P1, P2, P3, P4, P5, P6))
 {
     return new MethodSlot6<T2, R, P1, P2, P3, P4, P5, P6>(object, function);
 }
Index: src/scim_socket.cpp
===================================================================
RCS file: /cvsroot/scim/scim/src/scim_socket.cpp,v
retrieving revision 1.44
diff -u -p -r1.44 scim_socket.cpp
--- src/scim_socket.cpp	1 Dec 2005 08:27:36 -0000	1.44
+++ src/scim_socket.cpp	21 Aug 2006 10:03:39 -0000
@@ -46,6 +46,10 @@
 #include <errno.h>
 #include <signal.h>
 
+#ifndef SUN_LEN
+#define SUN_LEN(su) (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
+#endif
+
 #include "scim_private.h"
 #include "scim.h"
 
Index: src/scim_transaction.cpp
===================================================================
RCS file: /cvsroot/scim/scim/src/scim_transaction.cpp,v
retrieving revision 1.14
diff -u -p -r1.14 scim_transaction.cpp
--- src/scim_transaction.cpp	7 Jun 2006 09:29:49 -0000	1.14
+++ src/scim_transaction.cpp	21 Aug 2006 10:03:39 -0000
@@ -791,7 +791,7 @@ TransactionReader::get_data (String &str
         }
 
         if (len)
-            str = String (m_impl->m_holder->m_buffer + m_impl->m_read_pos, m_impl->m_holder->m_buffer + m_impl->m_read_pos + len);
+            str = String ((const char*)(m_impl->m_holder->m_buffer + m_impl->m_read_pos), (const char*)(m_impl->m_holder->m_buffer + m_impl->m_read_pos + len));
         else
             str = String ("");
 
@@ -827,7 +827,7 @@ TransactionReader::get_data (WideString 
         }
 
         if (len)
-            mbs = String (m_impl->m_holder->m_buffer + m_impl->m_read_pos, m_impl->m_holder->m_buffer + m_impl->m_read_pos + len);
+            mbs = String ((const char*)(m_impl->m_holder->m_buffer + m_impl->m_read_pos), (const char*)(m_impl->m_holder->m_buffer + m_impl->m_read_pos + len));
         else
             mbs = String ("");
 
Index: src/scim_utility.cpp
===================================================================
RCS file: /cvsroot/scim/scim/src/scim_utility.cpp,v
retrieving revision 1.50
diff -u -p -r1.50 scim_utility.cpp
--- src/scim_utility.cpp	22 Feb 2006 03:47:10 -0000	1.50
+++ src/scim_utility.cpp	21 Aug 2006 10:03:40 -0000
@@ -39,6 +39,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <errno.h>
+#include <locale.h>
 
 #include "scim_private.h"
 #include "scim.h"
Index: tests/Makefile.am
===================================================================
RCS file: /cvsroot/scim/scim/tests/Makefile.am,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile.am
--- tests/Makefile.am	10 Jul 2005 13:45:39 -0000	1.15
+++ tests/Makefile.am	21 Aug 2006 10:03:40 -0000
@@ -49,7 +49,6 @@ test_helper_la_CXXFLAGS	= @GTK2_CFLAGS@
 test_helper_la_LDFLAGS	= -avoid-version \
 		     	  -rpath $(helpermoduledir) \
 			  -module \
-			  -lstdc++ \
 			  @LIBTOOL_EXPORT_OPTIONS@ \
 			  @GTK2_LIBS@ \
 			  @LTLIBINTL@