Fix IMEngine socket path for 64bit machine

Change-Id: I24fc56ca35bfc6f56b5e044c1a4fb240236e4f30

diff --git a/configure.ac b/configure.ac
index 82e5d84..45de063 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -830,6 +830,7 @@ SCIM_MODULE_PATH="$libdir/scim$SCIM_EPOCH"
 SCIM_LIBEXECDIR="$libdir/scim$SCIM_EPOCH"
 SCIM_LOCALEDIR="/usr/share/locale"
 SCIM_TEMPDIR="/run/.isf"
+SCIM_LIBDIR="$libdir"
 
 AC_SUBST(SCIM_BINDIR)
 AC_SUBST(SCIM_DATADIR)
@@ -839,6 +840,7 @@ AC_SUBST(SCIM_MODULE_PATH)
 AC_SUBST(SCIM_LIBEXECDIR)
 AC_SUBST(SCIM_LOCALEDIR)
 AC_SUBST(SCIM_TEMPDIR)
+AC_SUBST(SCIM_LIBDIR)
 
 AC_SUBST(RO_APP_DIR)
 AC_SUBST(RO_PACKAGES_DIR)

diff --git a/ism/src/Makefile.am b/ism/src/Makefile.am
index d2864ec..50b5320 100644 (file)
--- a/ism/src/Makefile.am
+++ b/ism/src/Makefile.am
@@ -34,6 +34,7 @@ AM_CPPFLAGS           = -I$(top_builddir) \
                          -DSCIM_LIBEXECDIR=\"@SCIM_LIBEXECDIR@\" \
                          -DSCIM_ICONDIR=\"@SCIM_ICONDIR@\" \
                          -DSCIM_MODULE_PATH=\"@SCIM_MODULE_PATH@\" \
+                         -DSCIM_LIBDIR=\"@SCIM_LIBDIR@\" \
                          @ISF_BUILDING_DLL@
 
 

diff --git a/ism/src/scim_module.cpp b/ism/src/scim_module.cpp
index a99e18f..efcbbf2 100644 (file)
--- a/ism/src/scim_module.cpp
+++ b/ism/src/scim_module.cpp
@@ -39,6 +39,8 @@
 
 namespace scim {
 
+#define SCIM_IMENGINE_SOCKET_PATH SCIM_LIBDIR"/scim-1.0/1.4.0/IMEngine/socket.so"
+
 typedef void (*ModuleInitFunc) (void);
 typedef void (*ModuleExitFunc) (void);
 
@@ -108,7 +110,7 @@ scim_get_module_list (std::vector <String>& mod_list, const String& type)
             mod_list.push_back(mname[i]);
 
         struct stat sb;
-        if (stat ("/usr/lib/scim-1.0/1.4.0/IMEngine/socket.so", &sb) == 0) {
+        if (stat (SCIM_IMENGINE_SOCKET_PATH, &sb) == 0) {
             if (S_ISREG(sb.st_mode))
                 mod_list.push_back("socket");
         }