diff -r -c ../IMdkit/IMdkit/Imakefile IMdkit/IMdkit/Imakefile
*** ../IMdkit/IMdkit/Imakefile	Tue Jun 20 04:55:57 1995
--- IMdkit/IMdkit/Imakefile	Tue Sep  2 22:59:27 1997
***************
*** 14,20 ****
  #endif
  
  #ifdef SharedLibXimd
! REQUIREDLIBS = $(XLIBONLY)
  #endif
  
  #define DoNormalLib NormalLibXimd
--- 14,20 ----
  #endif
  
  #ifdef SharedLibXimd
! REQUIREDLIBS = -L$(SHLIBDIR) $(XLIBONLY)
  #endif
  
  #define DoNormalLib NormalLibXimd
diff -r -c ../IMdkit/IMdkit/Xi18n/i18nClbk.c IMdkit/IMdkit/Xi18n/i18nClbk.c
*** ../IMdkit/IMdkit/Xi18n/i18nClbk.c	Tue Jun 20 04:55:56 1995
--- IMdkit/IMdkit/Xi18n/i18nClbk.c	Tue Sep  2 22:59:27 1997
***************
*** 504,510 ****
      FrameMgrPutToken(fm, connect_id);
      FrameMgrPutToken(fm, call_back->icid);
      FrameMgrPutToken(fm, strconv->position);
!     FrameMgrPutToken(fm, strconv->type);
      FrameMgrPutToken(fm, strconv->operation);
  #if 0
      FrameMgrPutToken(fm, strconv->text->string);
--- 504,510 ----
      FrameMgrPutToken(fm, connect_id);
      FrameMgrPutToken(fm, call_back->icid);
      FrameMgrPutToken(fm, strconv->position);
!     FrameMgrPutToken(fm, strconv->direction);
      FrameMgrPutToken(fm, strconv->operation);
  #if 0
      FrameMgrPutToken(fm, strconv->text->string);
diff -r -c ../IMdkit/IMdkit/Xi18n/i18nMethod.c IMdkit/IMdkit/Xi18n/i18nMethod.c
*** ../IMdkit/IMdkit/Xi18n/i18nMethod.c	Tue Jun 20 04:55:57 1995
--- IMdkit/IMdkit/Xi18n/i18nMethod.c	Tue Sep  2 22:59:27 1997
***************
*** 848,853 ****
--- 848,854 ----
  			      XIM_ERROR, 0, 0, 0);
  	    return False;
  	}
+ 	FrameMgrSetBuffer(fm, reply);
  	FrameMgrPutToken(fm, call_data->connect_id);
  	FrameMgrPutToken(fm, call_data->icid);
  	FrameMgrPutToken(fm, call_data->flag);
diff -r -c ../IMdkit/IMdkit/Xi18n/i18nPtHdr.c IMdkit/IMdkit/Xi18n/i18nPtHdr.c
*** ../IMdkit/IMdkit/Xi18n/i18nPtHdr.c	Tue Jun 20 04:55:57 1995
--- IMdkit/IMdkit/Xi18n/i18nPtHdr.c	Tue Sep  2 22:59:27 1997
***************
*** 1287,1299 ****
  	    }
  	}
      }
!     /*
!       Encoinding Negotiation isn't supported yet in the IMlibrary, so
!       rather safe and sound to always return XIM_Default_Encoding_IDX(-1).
!      */
!     return (INT16)XIM_Default_Encoding_IDX;
! #if 0
      return (INT16)enc_index;
  #endif
  }
  
--- 1287,1296 ----
  	    }
  	}
      }
! 
      return (INT16)enc_index;
+ #if 0
+     return (INT16)XIM_Default_Encoding_IDX;
  #endif
  }