--- imelib.orig	2004-11-04 09:08:41.000000000 +0900
+++ imelib	2005-01-24 00:10:57.000000000 +0900
@@ -341,9 +341,16 @@
 }
 
 isAtokxAlive(){
-if [ -z "`ps ax | grep atokmngdaemon 2>/dev/null`" ]; then
-    eval AtokxNotAliveMsg_$LOCALE
-    return -1
+if [ -f "/opt/atokx2/bin/atokx2_client.sh" ] ; then
+    if [ -z "`ps ax | grep atokx2mngdaemon 2>/dev/null`" ]; then
+        eval AtokxNotAliveMsg_$LOCALE
+        return -1
+    fi
+else
+    if [ -z "`ps ax | grep atokmngdaemon 2>/dev/null`" ]; then
+        eval AtokxNotAliveMsg_$LOCALE
+        return -1
+    fi
 fi
 return 0
 }
@@ -404,10 +411,14 @@
 }
 
 AtokxExists(){
-if [ -f "/usr/lib/locale/ja/atokserver/atokmngdaemon" ] ; then
+if [ -f "/opt/atokx2/bin/atokx2_client.sh" ] ; then
     return 0
 else
-    return -1
+    if [ -f "/usr/lib/locale/ja/atokserver/atokmngdaemon" ] ; then
+        return 0
+    else
+        return -1
+    fi
 fi
 }
 
@@ -544,27 +555,31 @@
    if [ -f ${HOME}/.Xdefaults ]; then
       xrdb -merge ${HOME}/.Xdefaults
     fi
-    if [ -f "/usr/lib/im/locale/ja/atokserver/shift_space" ]; then
-        echo "*conversionOnKeys: Kanji Zenkaku_Hankaku <Shift>space" | /usr/X11R6/bin/xrdb -m
+    if [ -f "/opt/atokx2/bin/atokx2_client.sh" ] ; then
+        . /opt/atokx2/bin/atokx2_client.sh
     else
-        echo "*conversionOnKeys: Kanji Zenkaku_Hankaku <Ctrl>space" | /usr/X11R6/bin/xrdb -m
-    fi
-    LD_PRELOAD=/usr/X11R6/lib/libXi.so.6 /usr/lib/im/httx -if atok12 -lc_basiclocale ja_JP -xim htt_xbe &
+        if [ -f "/usr/lib/im/locale/ja/atokserver/shift_space" ]; then
+            echo "*conversionOnKeys: Kanji Zenkaku_Hankaku <Shift>space" | /usr/X11R6/bin/xrdb -m
+        else
+            echo "*conversionOnKeys: Kanji Zenkaku_Hankaku <Ctrl>space" | /usr/X11R6/bin/xrdb -m
+        fi
+        LD_PRELOAD=/usr/X11R6/lib/libXi.so.6 /usr/lib/im/httx -if atok12 -lc_basiclocale ja_JP -xim htt_xbe &
 
-    times=0
+        times=0
 
-    while :
-    do
-     if [ -n "`ps xc | grep LookupAux`" ]; then
-#         sleep 1
-         break
-     fi
-     usleep 100000
-     times=$[$times+1]
-     if [ $times -ge "30" ]; then
-         break
-     fi
-    done
+        while :
+        do
+         if [ -n "`ps xc | grep LookupAux`" ]; then
+#             sleep 1
+             break
+         fi
+         usleep 100000
+         times=$[$times+1]
+         if [ $times -ge "30" ]; then
+             break
+         fi
+        done
+    fi
 
 fi