[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freewnn:00420] Re: shared library



濱嶋です。

Wed, 26 Jul 2000 00:22:23 +0900 に
Tatsuo Furukawa <frkwtto@osk3.3web.ne.jp> さんが書かれた
<200007251520.AAA27716@pop1.ngy.3web.ne.jp> を引用しています

濱嶋さん> 最近NetBSD/hpcmipsに手を出したので、shared library化されてい
濱嶋さん> ると素敵だなぁなんて思ったんですが、誰か作業されている方はい
濱嶋さん> ますでしょうか?
> 
> この ML にながれた情報以上のことは私も聞いたことはないです。:)

ということは誰もやってないってことですね?ざっと過去のメールを斜め読みし
て、
  1. 名前は変えない(libfreewnn.*にしない)
  2. バージョン番号は0.0からはじめる
という認識のもとにGNU libtoolを使ってshared library化してみました。
(libjd.aはしていません)

# 正式採用の際にはINSTALLに「shared libraryを作成するにはGNU libtoolが必
# 要です。」と追加してください。(_o_)

1.1.1-a017へのパッチですが、libtoolやautoconfを知らない輩が見様見真似で
作ったので、もっと良い方法があればどんどん修正してください。特に
Wnn/jlib.V3/Makefile.inではlibwnn.aのコピーにかなり強引なことをしていま
す。もっとスマートな方法があれば是非変更したいところです。

それからNetBSD/hpcmipsでしか試していませんので、他のプラットフォームでも
確認をお願いします。libtoolが/usr/local/bin以外にあるOSはconfigure.inに
追加してください。
diff -rc FreeWnn-1.1.1-a017/Xsi/Wnn/jlib/Makefile.in FreeWnn-1.1.1-a017-shared/Xsi/Wnn/jlib/Makefile.in
*** FreeWnn-1.1.1-a017/Xsi/Wnn/jlib/Makefile.in	Tue Mar 21 01:21:11 2000
--- FreeWnn-1.1.1-a017-shared/Xsi/Wnn/jlib/Makefile.in	Wed Jul 26 14:03:16 2000
***************
*** 81,91 ****
  
  .c.o:
  	$(RM) $@
! 	$(CC) -c $(CFLAGS) $(_NOOP_) $*.c
  
  clean::
  
! all:: $(OBJS) libwnn.a
  
  all:: libgetopt.a
  
--- 81,93 ----
  
  .c.o:
  	$(RM) $@
! 	$(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $*.c
  
  clean::
+ 	$(RM) -r .libs
+ 	$(RM) *.lo *.la
  
! all:: $(OBJS) libwnn.$(A)
  
  all:: libgetopt.a
  
***************
*** 109,125 ****
  
  kankana: kankana.o
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) kankana.o $(WNNJLIB)
  
  clean::
  	$(RM) kankana
  
! all:: libwnn.a
  
! libwnn.a: $(OBJS) $(EXTRALIBRARYDEPS)
  	$(RM) $@
! 	$(AR) $@ $(OBJS)
! 	$(RANLIB) $@
  
  lintlib:: llib-lwnn.ln
  
--- 111,131 ----
  
  kankana: kankana.o
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) kankana.o $(WNNJLIB)
  
  clean::
  	$(RM) kankana
  
! all:: libwnn.$(A)
  
! libwnn.$(A): $(OBJS) $(EXTRALIBRARYDEPS)
  	$(RM) $@
! 	@if [ "$(A)" = "a" ] ; then \
! 		$(AR) $@ $(OBJS) ; \
! 		$(RANLIB) $@ ; \
! 	else \
! 		$(LIBTOOL) $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(DESTDIR)$(WNNLIBDIR) -version-info $(WNNJLIBVERSION) ; \
! 	fi
  
  lintlib:: llib-lwnn.ln
  
***************
*** 129,160 ****
  
  instlib:: install
  
! install:: libwnn.a
  	@if [ -d $(DESTDIR)$(WNNLIBDIR) ]; then set +x; \
  	else (set -x; $(MKDIRHIER) $(DESTDIR)$(WNNLIBDIR)); fi
! 	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) libwnn.a $(DESTDIR)$(WNNLIBDIR)
! 	$(RANLIB) $(RANLIBINSTFLAGS) $(DESTDIR)$(WNNLIBDIR)/libwnn.a
  
  $(OBJ3) : $(SRC3)
! 	$(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ4) : $(SRC4)
! 	$(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ5) : $(SRC5)
! 	$(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ6) : $(SRC6)
! 	$(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ7) : $(SRC7)
! 	$(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ8) : $(SRC8)
! 	$(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ9) : $(SRC9)
! 	$(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
  
  $(LOCAL_RKOBJS) : $(LOCAL_RKSRCS)
  	@case '${MFLAGS}' in *[ik]*) set +e;; esac; 	cd $(WNNROMKANSRC); echo "making all in $(WNNROMKANSRC)"; 	$(MAKE) 'CDEBUGFLAGS=$(CDEBUGFLAGS)' $(MFLAGS)
--- 135,168 ----
  
  instlib:: install
  
! install:: libwnn.$(A)
  	@if [ -d $(DESTDIR)$(WNNLIBDIR) ]; then set +x; \
  	else (set -x; $(MKDIRHIER) $(DESTDIR)$(WNNLIBDIR)); fi
! 	$(LIBTOOL) $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) libwnn.$(A) $(DESTDIR)$(WNNLIBDIR) ; \
! 	if [ "$(A)" = "a" ] ; then \
! 		$(RANLIB) $(RANLIBINSTFLAGS) $(DESTDIR)$(WNNLIBDIR)/libwnn.$(A) ; \
! 	fi
  
  $(OBJ3) : $(SRC3)
! 	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ4) : $(SRC4)
! 	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ5) : $(SRC5)
! 	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ6) : $(SRC6)
! 	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ7) : $(SRC7)
! 	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ8) : $(SRC8)
! 	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ9) : $(SRC9)
! 	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
  
  $(LOCAL_RKOBJS) : $(LOCAL_RKSRCS)
  	@case '${MFLAGS}' in *[ik]*) set +e;; esac; 	cd $(WNNROMKANSRC); echo "making all in $(WNNROMKANSRC)"; 	$(MAKE) 'CDEBUGFLAGS=$(CDEBUGFLAGS)' $(MFLAGS)
diff -rc FreeWnn-1.1.1-a017/Xsi/Wnn/jlib.V3/Makefile.in FreeWnn-1.1.1-a017-shared/Xsi/Wnn/jlib.V3/Makefile.in
*** FreeWnn-1.1.1-a017/Xsi/Wnn/jlib.V3/Makefile.in	Fri Jan 21 01:00:28 2000
--- FreeWnn-1.1.1-a017-shared/Xsi/Wnn/jlib.V3/Makefile.in	Wed Jul 26 13:14:19 2000
***************
*** 62,73 ****
  	$(RM) $@
  	$(CC) -c $(CFLAGS) $(_NOOP_) $*.c
  
- clean::
- 
  all:: libjd.a
  
  libjd.a: $(OBJS) $(WNNJLIB)
! 	cp $(WNNJLIB) $@
  	ar rv $@ $(OBJS)
  	$(RANLIB) $@
  
--- 62,76 ----
  	$(RM) $@
  	$(CC) -c $(CFLAGS) $(_NOOP_) $*.c
  
  all:: libjd.a
  
  libjd.a: $(OBJS) $(WNNJLIB)
! 	@if [ "$(A)" = "a" ] ; then \
! 		cp $(WNNJLIB) $@ ; \
! 	else \
! 		eval `$(LIBTOOL) -n --mode=install cp $(WNNJLIB) $(WNNJLIBV3SRC) 2>/dev/null | egrep "^cp.*\.a$$"` ; \
! 		mv `basename $(WNNJLIB) .$(A)`.a $@ ; \
! 	fi
  	ar rv $@ $(OBJS)
  	$(RANLIB) $@
  
diff -rc FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/Makefile.in FreeWnn-1.1.1-a017-shared/Xsi/Wnn/jserver/Makefile.in
*** FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/Makefile.in	Tue Mar 21 02:34:04 2000
--- FreeWnn-1.1.1-a017-shared/Xsi/Wnn/jserver/Makefile.in	Wed Jul 26 14:38:42 2000
***************
*** 83,99 ****
  
  jserver: $(OBJS)
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJS) @LIBS@
  
  clean::
  	$(RM) jserver
  
  instserver:: install
  
  install:: jserver
  	@if [ -d $(DESTDIR)$(JWNNBINDIR) ]; then set +x; \
  	else (set -x; $(MKDIRHIER) $(DESTDIR)$(JWNNBINDIR)); fi
! 	$(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) jserver $(DESTDIR)$(JWNNBINDIR)/jserver
  
  $(OBJ0) : $(SRC0)
  	$(CC) -c $(CFLAGS) $(SERVERINITDEF) $(FORKDEF) $(SOLINGERDEFS) ./`basename $@ .o`.c
--- 83,101 ----
  
  jserver: $(OBJS)
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJS) @LIBS@
  
  clean::
  	$(RM) jserver
+ 	$(RM) -r .libs
+ 	$(RM) *.lo *.la
  
  instserver:: install
  
  install:: jserver
  	@if [ -d $(DESTDIR)$(JWNNBINDIR) ]; then set +x; \
  	else (set -x; $(MKDIRHIER) $(DESTDIR)$(JWNNBINDIR)); fi
! 	$(LIBTOOL) $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) jserver $(DESTDIR)$(JWNNBINDIR)/jserver
  
  $(OBJ0) : $(SRC0)
  	$(CC) -c $(CFLAGS) $(SERVERINITDEF) $(FORKDEF) $(SOLINGERDEFS) ./`basename $@ .o`.c
diff -rc FreeWnn-1.1.1-a017/Xsi/Wnn/jutil/Makefile.in FreeWnn-1.1.1-a017-shared/Xsi/Wnn/jutil/Makefile.in
*** FreeWnn-1.1.1-a017/Xsi/Wnn/jutil/Makefile.in	Sun Jan 30 12:50:59 2000
--- FreeWnn-1.1.1-a017-shared/Xsi/Wnn/jutil/Makefile.in	Wed Jul 26 14:34:09 2000
***************
*** 108,179 ****
  
  all:: $(PROGRAMS)
  
  atod: $(OBJATOD)
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOD) @LIBS@
  
  clean::
  	$(RM) atod
  
  atof: $(OBJATOF)
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOF) @LIBS@
  
  clean::
  	$(RM) atof
  
  wnntouch: $(OBJTOUCH)
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJTOUCH) @LIBS@
  
  clean::
  	$(RM) wnntouch
  
  dicsort: $(OBJSORT)
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJSORT)
  
  clean::
  	$(RM) dicsort
  
  oldatonewa: $(OBJOLDTONEW)
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJOLDTONEW) @LIBS@
  
  clean::
  	$(RM) oldatonewa
  
  dtoa: $(OBJDTOA)
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJDTOA) @LIBS@
  
  clean::
  	$(RM) dtoa
  
  wnnstat: $(OBJSTAT) $(WNNJLIB)
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJSTAT) $(WNNJLIB) @LIBS@
  
  clean::
  	$(RM) wnnstat
  
  wnnkill: $(OBJKILL) $(WNNJLIB)
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJKILL) $(WNNJLIB) @LIBS@
  
  clean::
  	$(RM) wnnkill
  
  wddel: $(OBJWDDEL) $(WNNJLIB)
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDDEL) $(WNNJLIB) @LIBS@
  
  clean::
  	$(RM) wddel
  
  wdreg: $(OBJWDREG) $(WNNJLIB)
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDREG) $(WNNJLIB) @LIBS@
  
  clean::
  	$(RM) wdreg
--- 108,183 ----
  
  all:: $(PROGRAMS)
  
+ clean::
+ 	$(RM) -r .libs
+ 	$(RM) *.lo *.la
+ 
  atod: $(OBJATOD)
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOD) @LIBS@
  
  clean::
  	$(RM) atod
  
  atof: $(OBJATOF)
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOF) @LIBS@
  
  clean::
  	$(RM) atof
  
  wnntouch: $(OBJTOUCH)
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJTOUCH) @LIBS@
  
  clean::
  	$(RM) wnntouch
  
  dicsort: $(OBJSORT)
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJSORT)
  
  clean::
  	$(RM) dicsort
  
  oldatonewa: $(OBJOLDTONEW)
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJOLDTONEW) @LIBS@
  
  clean::
  	$(RM) oldatonewa
  
  dtoa: $(OBJDTOA)
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJDTOA) @LIBS@
  
  clean::
  	$(RM) dtoa
  
  wnnstat: $(OBJSTAT) $(WNNJLIB)
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJSTAT) $(WNNJLIB) @LIBS@
  
  clean::
  	$(RM) wnnstat
  
  wnnkill: $(OBJKILL) $(WNNJLIB)
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJKILL) $(WNNJLIB) @LIBS@
  
  clean::
  	$(RM) wnnkill
  
  wddel: $(OBJWDDEL) $(WNNJLIB)
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDDEL) $(WNNJLIB) @LIBS@
  
  clean::
  	$(RM) wddel
  
  wdreg: $(OBJWDREG) $(WNNJLIB)
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDREG) $(WNNJLIB) @LIBS@
  
  clean::
  	$(RM) wdreg
***************
*** 184,190 ****
  	@for flag in ${MAKEFLAGS} ''; do \
  	case "$$flag" in *=*) ;; *[i]*) set +e;; esac; done; \
  	for i in $(PROGRAMS); do \
! 	(set -x; $(INSTALL) $(INSTALLFLAGS)  $$i $(DESTDIR)$(JWNNBINDIR)); \
  	done
  
  $(OBJ1) : $(SRC1)
--- 188,194 ----
  	@for flag in ${MAKEFLAGS} ''; do \
  	case "$$flag" in *=*) ;; *[i]*) set +e;; esac; done; \
  	for i in $(PROGRAMS); do \
! 	(set -x; $(LIBTOOL) $(INSTALL) $(INSTALLFLAGS)  $$i $(DESTDIR)$(JWNNBINDIR)); \
  	done
  
  $(OBJ1) : $(SRC1)
diff -rc FreeWnn-1.1.1-a017/Xsi/Wnn/romkan/Makefile.in FreeWnn-1.1.1-a017-shared/Xsi/Wnn/romkan/Makefile.in
*** FreeWnn-1.1.1-a017/Xsi/Wnn/romkan/Makefile.in	Sun Jan 30 12:48:51 2000
--- FreeWnn-1.1.1-a017-shared/Xsi/Wnn/romkan/Makefile.in	Wed Jul 26 14:05:13 2000
***************
*** 51,59 ****
  
  .c.o:
  	$(RM) $@
! 	$(CC) -c $(CFLAGS) $(_NOOP_) $*.c
  
  clean::
  
  all:: $(OBJS)
  
--- 51,61 ----
  
  .c.o:
  	$(RM) $@
! 	$(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $*.c
  
  clean::
+ 	$(RM) -r .libs
+ 	$(RM) *.lo *.la
  
  all:: $(OBJS)
  
diff -rc FreeWnn-1.1.1-a017/Xsi/cWnn/jlib/Makefile.in FreeWnn-1.1.1-a017-shared/Xsi/cWnn/jlib/Makefile.in
*** FreeWnn-1.1.1-a017/Xsi/cWnn/jlib/Makefile.in	Tue Mar 21 01:21:12 2000
--- FreeWnn-1.1.1-a017-shared/Xsi/cWnn/jlib/Makefile.in	Wed Jul 26 14:26:32 2000
***************
*** 82,92 ****
  
  .c.o:
  	$(RM) $@
! 	$(CC) -c $(CFLAGS) $(_NOOP_) $*.c
  
  clean::
  
! all:: $(LINKS) $(OBJS) libcwnn.a
  
  includes:: $(LINKS)
  
--- 82,94 ----
  
  .c.o:
  	$(RM) $@
! 	$(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $*.c
  
  clean::
+ 	$(RM) -r .libs
+ 	$(RM) *.lo *.la
  
! all:: $(LINKS) $(OBJS) libcwnn.$(A)
  
  includes:: $(LINKS)
  
***************
*** 167,183 ****
  
  kankana: kankana.o
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) kankana.o $(CWNNJLIB)
  
  clean::
  	$(RM) kankana
  
! all:: libcwnn.a
  
! libcwnn.a: $(OBJS) $(EXTRALIBRARYDEPS)
  	$(RM) $@
! 	$(AR) $@ $(OBJS)
! 	$(RANLIB) $@
  
  lintlib:: llib-lcwnn.ln
  
--- 169,189 ----
  
  kankana: kankana.o
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) kankana.o $(CWNNJLIB)
  
  clean::
  	$(RM) kankana
  
! all:: libcwnn.$(A)
  
! libcwnn.$(A): $(OBJS) $(EXTRALIBRARYDEPS)
  	$(RM) $@
! 	@if [ "$(A)" = "a" ] ; then \
! 		$(AR) $@ $(OBJS) ;\
! 		$(RANLIB) $@ ; \
! 	else \
! 		$(LIBTOOL) $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(DESTDIR)$(WNNLIBDIR) -version-info $(CWNNJLIBVERSION) ; \
! 	fi
  
  lintlib:: llib-lcwnn.ln
  
***************
*** 187,218 ****
  
  instlib:: install
  
! install:: libcwnn.a
  	@if [ -d $(DESTDIR)$(WNNLIBDIR) ]; then set +x; \
  	else (set -x; $(MKDIRHIER) $(DESTDIR)$(WNNLIBDIR)); fi
! 	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) libcwnn.a $(DESTDIR)$(WNNLIBDIR)
! 	$(RANLIB) $(RANLIBINSTFLAGS) $(DESTDIR)$(WNNLIBDIR)/libcwnn.a
  
  $(OBJ3) : $(SRC3)
! 	$(CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ4) : $(SRC4)
! 	$(CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ5) : $(SRC5)
! 	$(CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ6) : $(SRC6)
! 	$(CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ7) : $(SRC7)
! 	$(CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ8) : $(SRC8)
! 	$(CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ9) : $(SRC9)
! 	$(CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
  
  $(LOCAL_RKOBJS) : $(LOCAL_RKSRCS)
  	@case '${MFLAGS}' in *[ik]*) set +e;; esac; 	cd $(CWNNROMKANSRC); echo "making all in $(CWNNROMKANSRC)"; 	$(MAKE) 'CDEBUGFLAGS=$(CDEBUGFLAGS)' $(MFLAGS)
--- 193,226 ----
  
  instlib:: install
  
! install:: libcwnn.$(A)
  	@if [ -d $(DESTDIR)$(WNNLIBDIR) ]; then set +x; \
  	else (set -x; $(MKDIRHIER) $(DESTDIR)$(WNNLIBDIR)); fi
! 	$(LIBTOOL) $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) libcwnn.$(A) $(DESTDIR)$(WNNLIBDIR)
! 	if [ "$(A)" = "a" ] ; then \
! 		$(RANLIB) $(RANLIBINSTFLAGS) $(DESTDIR)$(WNNLIBDIR)/libcwnn.$(A) ; \
! 	fi
  
  $(OBJ3) : $(SRC3)
! 	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ4) : $(SRC4)
! 	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ5) : $(SRC5)
! 	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ6) : $(SRC6)
! 	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ7) : $(SRC7)
! 	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ8) : $(SRC8)
! 	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ9) : $(SRC9)
! 	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
  
  $(LOCAL_RKOBJS) : $(LOCAL_RKSRCS)
  	@case '${MFLAGS}' in *[ik]*) set +e;; esac; 	cd $(CWNNROMKANSRC); echo "making all in $(CWNNROMKANSRC)"; 	$(MAKE) 'CDEBUGFLAGS=$(CDEBUGFLAGS)' $(MFLAGS)
diff -rc FreeWnn-1.1.1-a017/Xsi/cWnn/jserver/Makefile.in FreeWnn-1.1.1-a017-shared/Xsi/cWnn/jserver/Makefile.in
*** FreeWnn-1.1.1-a017/Xsi/cWnn/jserver/Makefile.in	Tue Mar 21 01:21:12 2000
--- FreeWnn-1.1.1-a017-shared/Xsi/cWnn/jserver/Makefile.in	Wed Jul 26 14:39:11 2000
***************
*** 102,107 ****
--- 102,109 ----
  
  clean::
  	$(RM) cserver
+ 	$(RM) -r .libs
+ 	$(RM) *.lo *.la
  
  tserver: $(TOBJS)
  	$(RM) $@
***************
*** 109,126 ****
  
  clean::
  	$(RM) tserver
  
  instserver:: install
  
  install:: cserver
  	@if [ -d $(DESTDIR)$(CWNNBINDIR) ]; then set +x; \
  	else (set -x; $(MKDIRHIER) $(DESTDIR)$(CWNNBINDIR)); fi
! 	$(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) cserver $(DESTDIR)$(CWNNBINDIR)/cserver
  
  install:: tserver
  	@if [ -d $(DESTDIR)$(CWNNBINDIR) ]; then set +x; \
  	else (set -x; $(MKDIRHIER) $(DESTDIR)$(CWNNBINDIR)); fi
! 	$(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) tserver $(DESTDIR)$(CWNNBINDIR)/tserver
  
  includes:: $(HDRS) $(SRC0) $(SRC1) $(TSRCS)
  
--- 111,130 ----
  
  clean::
  	$(RM) tserver
+ 	$(RM) -r .libs
+ 	$(RM) *.lo *.la
  
  instserver:: install
  
  install:: cserver
  	@if [ -d $(DESTDIR)$(CWNNBINDIR) ]; then set +x; \
  	else (set -x; $(MKDIRHIER) $(DESTDIR)$(CWNNBINDIR)); fi
! 	$(LIBTOOL) $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) cserver $(DESTDIR)$(CWNNBINDIR)/cserver
  
  install:: tserver
  	@if [ -d $(DESTDIR)$(CWNNBINDIR) ]; then set +x; \
  	else (set -x; $(MKDIRHIER) $(DESTDIR)$(CWNNBINDIR)); fi
! 	$(LIBTOOL) $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) tserver $(DESTDIR)$(CWNNBINDIR)/tserver
  
  includes:: $(HDRS) $(SRC0) $(SRC1) $(TSRCS)
  
diff -rc FreeWnn-1.1.1-a017/Xsi/cWnn/jutil/Makefile.in FreeWnn-1.1.1-a017-shared/Xsi/cWnn/jutil/Makefile.in
*** FreeWnn-1.1.1-a017/Xsi/cWnn/jutil/Makefile.in	Sun Jan 30 14:54:49 2000
--- FreeWnn-1.1.1-a017-shared/Xsi/cWnn/jutil/Makefile.in	Wed Jul 26 14:34:53 2000
***************
*** 108,172 ****
  
  all:: $(PROGRAMS)
  
  catod: $(OBJATOD)
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOD) @LIBS@
  
  clean::
  	$(RM) catod
  
  catof: $(OBJATOF)
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOF) @LIBS@
  
  clean::
  	$(RM) catof
  
  cwnntouch: $(OBJTOUCH)
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJTOUCH) @LIBS@
  
  clean::
  	$(RM) cwnntouch
  
  cdicsort: $(OBJSORT)
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJSORT)
  
  clean::
  	$(RM) cdicsort
  
  cdtoa: $(OBJDTOA)
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJDTOA) @LIBS@
  
  clean::
  	$(RM) cdtoa
  
  cwnnstat: $(OBJSTAT) $(CWNNJLIB)
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJSTAT) $(CWNNJLIB) @LIBS@
  
  clean::
  	$(RM) cwnnstat
  
  cwnnkill: $(OBJKILL) $(CWNNJLIB)
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJKILL) $(CWNNJLIB) @LIBS@
  
  clean::
  	$(RM) cwnnkill
  
  cwddel: $(OBJWDDEL) $(CWNNJLIB)
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDDEL) $(CWNNJLIB) @LIBS@
  
  clean::
  	$(RM) cwddel
  
  cwdreg: $(OBJWDREG) $(CWNNJLIB)
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDREG) $(CWNNJLIB) @LIBS@
  
  clean::
  	$(RM) cwdreg
--- 108,176 ----
  
  all:: $(PROGRAMS)
  
+ clean::
+ 	$(RM) -r .libs
+ 	$(RM) *.lo *.la
+ 
  catod: $(OBJATOD)
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOD) @LIBS@
  
  clean::
  	$(RM) catod
  
  catof: $(OBJATOF)
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOF) @LIBS@
  
  clean::
  	$(RM) catof
  
  cwnntouch: $(OBJTOUCH)
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJTOUCH) @LIBS@
  
  clean::
  	$(RM) cwnntouch
  
  cdicsort: $(OBJSORT)
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJSORT)
  
  clean::
  	$(RM) cdicsort
  
  cdtoa: $(OBJDTOA)
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJDTOA) @LIBS@
  
  clean::
  	$(RM) cdtoa
  
  cwnnstat: $(OBJSTAT) $(CWNNJLIB)
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJSTAT) $(CWNNJLIB) @LIBS@
  
  clean::
  	$(RM) cwnnstat
  
  cwnnkill: $(OBJKILL) $(CWNNJLIB)
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJKILL) $(CWNNJLIB) @LIBS@
  
  clean::
  	$(RM) cwnnkill
  
  cwddel: $(OBJWDDEL) $(CWNNJLIB)
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDDEL) $(CWNNJLIB) @LIBS@
  
  clean::
  	$(RM) cwddel
  
  cwdreg: $(OBJWDREG) $(CWNNJLIB)
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDREG) $(CWNNJLIB) @LIBS@
  
  clean::
  	$(RM) cwdreg
***************
*** 324,330 ****
  	@for flag in ${MAKEFLAGS} ''; do \
  	case "$$flag" in *=*) ;; *[i]*) set +e;; esac; done; \
  	for i in $(PROGRAMS); do \
! 	(set -x; $(INSTALL) $(INSTALLFLAGS)  $$i $(DESTDIR)$(CWNNBINDIR)); \
  	done
  
  $(OBJ1) : $(SRC1)
--- 328,334 ----
  	@for flag in ${MAKEFLAGS} ''; do \
  	case "$$flag" in *=*) ;; *[i]*) set +e;; esac; done; \
  	for i in $(PROGRAMS); do \
! 	(set -x; $(LIBTOOL) $(INSTALL) $(INSTALLFLAGS)  $$i $(DESTDIR)$(CWNNBINDIR)); \
  	done
  
  $(OBJ1) : $(SRC1)
diff -rc FreeWnn-1.1.1-a017/Xsi/cWnn/romkan/Makefile.in FreeWnn-1.1.1-a017-shared/Xsi/cWnn/romkan/Makefile.in
*** FreeWnn-1.1.1-a017/Xsi/cWnn/romkan/Makefile.in	Sun Jan 30 14:53:39 2000
--- FreeWnn-1.1.1-a017-shared/Xsi/cWnn/romkan/Makefile.in	Wed Jul 26 14:09:12 2000
***************
*** 53,61 ****
  
  .c.o:
  	$(RM) $@
! 	$(CC) -c $(CFLAGS) $(_NOOP_) $*.c
  
  clean::
  
  all:: $(HDRS) $(SRCS) $(OBJS)
  
--- 53,63 ----
  
  .c.o:
  	$(RM) $@
! 	$(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $*.c
  
  clean::
+ 	$(RM) -r .libs
+ 	$(RM) *.lo *.la
  
  all:: $(HDRS) $(SRCS) $(OBJS)
  
diff -rc FreeWnn-1.1.1-a017/Xsi/configure FreeWnn-1.1.1-a017-shared/Xsi/configure
*** FreeWnn-1.1.1-a017/Xsi/configure	Tue Mar 21 01:40:42 2000
--- FreeWnn-1.1.1-a017-shared/Xsi/configure	Wed Jul 26 13:25:09 2000
***************
*** 12,17 ****
--- 12,19 ----
  ac_default_prefix=/usr/local
  # Any additions from configure.in:
  ac_help="$ac_help
+   --enable-sharedlib      build shared library using GNU libtool"
+ ac_help="$ac_help
    --with-x                use the X Window System"
  
  # Initialize some variables set by options.
***************
*** 534,544 ****
  
  
  
  
  # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:542: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 536,560 ----
  
  
  
+ # Check whether --enable-sharedlib or --disable-sharedlib was given.
+ if test "${enable_sharedlib+set}" = set; then
+   enableval="$enable_sharedlib"
+   if test "$enableval" = yes
+   then
+     use_sharedlib=yes
+   else
+     use_sharedlib=no
+   fi
+ else
+   use_sharedlib=default
+ fi
+ 
+ 
  
  # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:558: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 568,574 ****
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:572: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 584,590 ----
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:588: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 619,625 ****
        # Extract the first word of "cl", so it can be a program name with args.
  set dummy cl; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:623: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 635,641 ----
        # Extract the first word of "cl", so it can be a program name with args.
  set dummy cl; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:639: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 651,657 ****
  fi
  
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:655: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
--- 667,673 ----
  fi
  
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:671: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
***************
*** 662,673 ****
  
  cat > conftest.$ac_ext << EOF
  
! #line 666 "configure"
  #include "confdefs.h"
  
  main(){return(0);}
  EOF
! if { (eval echo configure:671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    ac_cv_prog_cc_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
    if (./conftest; exit) 2>/dev/null; then
--- 678,689 ----
  
  cat > conftest.$ac_ext << EOF
  
! #line 682 "configure"
  #include "confdefs.h"
  
  main(){return(0);}
  EOF
! if { (eval echo configure:687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    ac_cv_prog_cc_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
    if (./conftest; exit) 2>/dev/null; then
***************
*** 693,704 ****
    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
  fi
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
! echo "configure:697: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
  echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
! echo "configure:702: checking whether we are using GNU C" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 709,720 ----
    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
  fi
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
! echo "configure:713: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
  echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
! echo "configure:718: checking whether we are using GNU C" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 707,713 ****
    yes;
  #endif
  EOF
! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:711: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    ac_cv_prog_gcc=yes
  else
    ac_cv_prog_gcc=no
--- 723,729 ----
    yes;
  #endif
  EOF
! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:727: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    ac_cv_prog_gcc=yes
  else
    ac_cv_prog_gcc=no
***************
*** 726,732 ****
  ac_save_CFLAGS="$CFLAGS"
  CFLAGS=
  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
! echo "configure:730: checking whether ${CC-cc} accepts -g" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 742,748 ----
  ac_save_CFLAGS="$CFLAGS"
  CFLAGS=
  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
! echo "configure:746: checking whether ${CC-cc} accepts -g" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 758,764 ****
  fi
  
  echo $ac_n "checking for cpp""... $ac_c" 1>&6
! echo "configure:762: checking for cpp" >&5
  hosttype=`uname`
  CCOPTIONS=""
  CDEBUGFLAGS=-O
--- 774,780 ----
  fi
  
  echo $ac_n "checking for cpp""... $ac_c" 1>&6
! echo "configure:778: checking for cpp" >&5
  hosttype=`uname`
  CCOPTIONS=""
  CDEBUGFLAGS=-O
***************
*** 867,873 ****
      ;;
  esac
  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
! echo "configure:871: checking how to run the C preprocessor" >&5
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
--- 883,889 ----
      ;;
  esac
  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
! echo "configure:887: checking how to run the C preprocessor" >&5
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
***************
*** 882,894 ****
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp.
    cat > conftest.$ac_ext <<EOF
! #line 886 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
--- 898,910 ----
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp.
    cat > conftest.$ac_ext <<EOF
! #line 902 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:908: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
***************
*** 899,911 ****
    rm -rf conftest*
    CPP="${CC-cc} -E -traditional-cpp"
    cat > conftest.$ac_ext <<EOF
! #line 903 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:909: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
--- 915,927 ----
    rm -rf conftest*
    CPP="${CC-cc} -E -traditional-cpp"
    cat > conftest.$ac_ext <<EOF
! #line 919 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:925: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
***************
*** 916,928 ****
    rm -rf conftest*
    CPP="${CC-cc} -nologo -E"
    cat > conftest.$ac_ext <<EOF
! #line 920 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
--- 932,944 ----
    rm -rf conftest*
    CPP="${CC-cc} -nologo -E"
    cat > conftest.$ac_ext <<EOF
! #line 936 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:942: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
***************
*** 978,984 ****
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # ./install, which can be erroneously created by make from ./install.sh.
  echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
! echo "configure:982: checking for a BSD compatible install" >&5
  if test -z "$INSTALL"; then
  if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 994,1000 ----
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # ./install, which can be erroneously created by make from ./install.sh.
  echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
! echo "configure:998: checking for a BSD compatible install" >&5
  if test -z "$INSTALL"; then
  if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1031,1037 ****
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
  echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
! echo "configure:1035: checking whether ln -s works" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1047,1053 ----
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
  echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
! echo "configure:1051: checking whether ln -s works" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1052,1058 ****
  fi
  
  echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
! echo "configure:1056: checking whether ${MAKE-make} sets \${MAKE}" >&5
  set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1068,1074 ----
  fi
  
  echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
! echo "configure:1072: checking whether ${MAKE-make} sets \${MAKE}" >&5
  set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1081,1087 ****
  # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1085: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1097,1103 ----
  # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1101: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1113,1119 ****
  
  
  echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
! echo "configure:1117: checking for crypt in -lcrypt" >&5
  ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1129,1135 ----
  
  
  echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
! echo "configure:1133: checking for crypt in -lcrypt" >&5
  ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1121,1127 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lcrypt  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1125 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
--- 1137,1143 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lcrypt  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1141 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
***************
*** 1132,1138 ****
  crypt()
  ; return 0; }
  EOF
! if { (eval echo configure:1136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 1148,1154 ----
  crypt()
  ; return 0; }
  EOF
! if { (eval echo configure:1152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 1160,1166 ****
  fi
  
  echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
! echo "configure:1164: checking for connect in -lsocket" >&5
  ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1176,1182 ----
  fi
  
  echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
! echo "configure:1180: checking for connect in -lsocket" >&5
  ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1168,1174 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1172 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
--- 1184,1190 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1188 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
***************
*** 1179,1185 ****
  connect()
  ; return 0; }
  EOF
! if { (eval echo configure:1183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 1195,1201 ----
  connect()
  ; return 0; }
  EOF
! if { (eval echo configure:1199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 1207,1213 ****
  fi
  
  echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
! echo "configure:1211: checking for gethostbyname in -lnsl" >&5
  ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1223,1229 ----
  fi
  
  echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
! echo "configure:1227: checking for gethostbyname in -lnsl" >&5
  ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1215,1221 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1219 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
--- 1231,1237 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1235 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
***************
*** 1226,1232 ****
  gethostbyname()
  ; return 0; }
  EOF
! if { (eval echo configure:1230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 1242,1248 ----
  gethostbyname()
  ; return 0; }
  EOF
! if { (eval echo configure:1246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 1259,1265 ****
  # Uses ac_ vars as temps to allow command line to override cache and checks.
  # --without-x overrides everything else, but does not touch the cache.
  echo $ac_n "checking for X""... $ac_c" 1>&6
! echo "configure:1263: checking for X" >&5
  
  # Check whether --with-x or --without-x was given.
  if test "${with_x+set}" = set; then
--- 1275,1281 ----
  # Uses ac_ vars as temps to allow command line to override cache and checks.
  # --without-x overrides everything else, but does not touch the cache.
  echo $ac_n "checking for X""... $ac_c" 1>&6
! echo "configure:1279: checking for X" >&5
  
  # Check whether --with-x or --without-x was given.
  if test "${with_x+set}" = set; then
***************
*** 1321,1332 ****
  
    # First, try using that file with no special directory specified.
  cat > conftest.$ac_ext <<EOF
! #line 1325 "configure"
  #include "confdefs.h"
  #include <$x_direct_test_include>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1330: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
--- 1337,1348 ----
  
    # First, try using that file with no special directory specified.
  cat > conftest.$ac_ext <<EOF
! #line 1341 "configure"
  #include "confdefs.h"
  #include <$x_direct_test_include>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
***************
*** 1395,1408 ****
    ac_save_LIBS="$LIBS"
    LIBS="-l$x_direct_test_library $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1399 "configure"
  #include "confdefs.h"
  
  int main() {
  ${x_direct_test_function}()
  ; return 0; }
  EOF
! if { (eval echo configure:1406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    LIBS="$ac_save_LIBS"
  # We can link X programs with no special library path.
--- 1411,1424 ----
    ac_save_LIBS="$LIBS"
    LIBS="-l$x_direct_test_library $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1415 "configure"
  #include "confdefs.h"
  
  int main() {
  ${x_direct_test_function}()
  ; return 0; }
  EOF
! if { (eval echo configure:1422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    LIBS="$ac_save_LIBS"
  # We can link X programs with no special library path.
***************
*** 1489,1500 ****
  fi
  
  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
! echo "configure:1493: checking for ANSI C header files" >&5
  if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1498 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
--- 1505,1516 ----
  fi
  
  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
! echo "configure:1509: checking for ANSI C header files" >&5
  if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1514 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
***************
*** 1502,1508 ****
  #include <float.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1506: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
--- 1518,1524 ----
  #include <float.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1522: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
***************
*** 1519,1525 ****
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 1523 "configure"
  #include "confdefs.h"
  #include <string.h>
  EOF
--- 1535,1541 ----
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 1539 "configure"
  #include "confdefs.h"
  #include <string.h>
  EOF
***************
*** 1537,1543 ****
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 1541 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
--- 1553,1559 ----
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 1557 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
***************
*** 1558,1564 ****
    :
  else
    cat > conftest.$ac_ext <<EOF
! #line 1562 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
--- 1574,1580 ----
    :
  else
    cat > conftest.$ac_ext <<EOF
! #line 1578 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
***************
*** 1569,1575 ****
  exit (0); }
  
  EOF
! if { (eval echo configure:1573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    :
  else
--- 1585,1591 ----
  exit (0); }
  
  EOF
! if { (eval echo configure:1589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    :
  else
***************
*** 1593,1604 ****
  fi
  
  echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
! echo "configure:1597: checking for sys/wait.h that is POSIX.1 compatible" >&5
  if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1602 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/wait.h>
--- 1609,1620 ----
  fi
  
  echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
! echo "configure:1613: checking for sys/wait.h that is POSIX.1 compatible" >&5
  if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1618 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/wait.h>
***************
*** 1614,1620 ****
  s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
  ; return 0; }
  EOF
! if { (eval echo configure:1618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_header_sys_wait_h=yes
  else
--- 1630,1636 ----
  s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
  ; return 0; }
  EOF
! if { (eval echo configure:1634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_header_sys_wait_h=yes
  else
***************
*** 1638,1654 ****
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:1642: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1647 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
--- 1654,1670 ----
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:1658: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1663 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
***************
*** 1676,1687 ****
  
  
  echo $ac_n "checking for mode_t""... $ac_c" 1>&6
! echo "configure:1680: checking for mode_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1685 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
--- 1692,1703 ----
  
  
  echo $ac_n "checking for mode_t""... $ac_c" 1>&6
! echo "configure:1696: checking for mode_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1701 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
***************
*** 1709,1720 ****
  fi
  
  echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
! echo "configure:1713: checking whether time.h and sys/time.h may both be included" >&5
  if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1718 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/time.h>
--- 1725,1736 ----
  fi
  
  echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
! echo "configure:1729: checking whether time.h and sys/time.h may both be included" >&5
  if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1734 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/time.h>
***************
*** 1723,1729 ****
  struct tm *tp;
  ; return 0; }
  EOF
! if { (eval echo configure:1727: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_header_time=yes
  else
--- 1739,1745 ----
  struct tm *tp;
  ; return 0; }
  EOF
! if { (eval echo configure:1743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_header_time=yes
  else
***************
*** 1744,1755 ****
  fi
  
  echo $ac_n "checking for time_t""... $ac_c" 1>&6
! echo "configure:1748: checking for time_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_time_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1753 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
--- 1760,1771 ----
  fi
  
  echo $ac_n "checking for time_t""... $ac_c" 1>&6
! echo "configure:1764: checking for time_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_time_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1769 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
***************
*** 1778,1786 ****
  
  
  echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
! echo "configure:1782: checking for socklen_t" >&5
  cat > conftest.$ac_ext <<EOF
! #line 1784 "configure"
  #include "confdefs.h"
  #include <sys/socket.h>
  EOF
--- 1794,1802 ----
  
  
  echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
! echo "configure:1798: checking for socklen_t" >&5
  cat > conftest.$ac_ext <<EOF
! #line 1800 "configure"
  #include "confdefs.h"
  #include <sys/socket.h>
  EOF
***************
*** 1803,1811 ****
  
  
  echo $ac_n "checking for RAND_MAX""... $ac_c" 1>&6
! echo "configure:1807: checking for RAND_MAX" >&5
  cat > conftest.$ac_ext <<EOF
! #line 1809 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #ifdef RAND_MAX
--- 1819,1827 ----
  
  
  echo $ac_n "checking for RAND_MAX""... $ac_c" 1>&6
! echo "configure:1823: checking for RAND_MAX" >&5
  cat > conftest.$ac_ext <<EOF
! #line 1825 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #ifdef RAND_MAX
***************
*** 1826,1838 ****
  
  if test $ac_cv_prog_gcc = yes; then
      echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
! echo "configure:1830: checking whether ${CC-cc} needs -traditional" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
      ac_pattern="Autoconf.*'x'"
    cat > conftest.$ac_ext <<EOF
! #line 1836 "configure"
  #include "confdefs.h"
  #include <sgtty.h>
  Autoconf TIOCGETP
--- 1842,1854 ----
  
  if test $ac_cv_prog_gcc = yes; then
      echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
! echo "configure:1846: checking whether ${CC-cc} needs -traditional" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
      ac_pattern="Autoconf.*'x'"
    cat > conftest.$ac_ext <<EOF
! #line 1852 "configure"
  #include "confdefs.h"
  #include <sgtty.h>
  Autoconf TIOCGETP
***************
*** 1850,1856 ****
  
    if test $ac_cv_prog_gcc_traditional = no; then
      cat > conftest.$ac_ext <<EOF
! #line 1854 "configure"
  #include "confdefs.h"
  #include <termio.h>
  Autoconf TCGETA
--- 1866,1872 ----
  
    if test $ac_cv_prog_gcc_traditional = no; then
      cat > conftest.$ac_ext <<EOF
! #line 1870 "configure"
  #include "confdefs.h"
  #include <termio.h>
  Autoconf TCGETA
***************
*** 1872,1878 ****
  fi
  
  echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
! echo "configure:1876: checking for 8-bit clean memcmp" >&5
  if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1888,1894 ----
  fi
  
  echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
! echo "configure:1892: checking for 8-bit clean memcmp" >&5
  if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1880,1886 ****
    ac_cv_func_memcmp_clean=no
  else
    cat > conftest.$ac_ext <<EOF
! #line 1884 "configure"
  #include "confdefs.h"
  
  main()
--- 1896,1902 ----
    ac_cv_func_memcmp_clean=no
  else
    cat > conftest.$ac_ext <<EOF
! #line 1900 "configure"
  #include "confdefs.h"
  
  main()
***************
*** 1890,1896 ****
  }
  
  EOF
! if { (eval echo configure:1894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_memcmp_clean=yes
  else
--- 1906,1912 ----
  }
  
  EOF
! if { (eval echo configure:1910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_memcmp_clean=yes
  else
***************
*** 1908,1919 ****
  test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
  
  echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
! echo "configure:1912: checking return type of signal handlers" >&5
  if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1917 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <signal.h>
--- 1924,1935 ----
  test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
  
  echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
! echo "configure:1928: checking return type of signal handlers" >&5
  if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1933 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <signal.h>
***************
*** 1930,1936 ****
  int i;
  ; return 0; }
  EOF
! if { (eval echo configure:1934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_signal=void
  else
--- 1946,1952 ----
  int i;
  ; return 0; }
  EOF
! if { (eval echo configure:1950: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_signal=void
  else
***************
*** 1949,1955 ****
  
  
  echo $ac_n "checking for wait3 that fills in rusage""... $ac_c" 1>&6
! echo "configure:1953: checking for wait3 that fills in rusage" >&5
  if eval "test \"`echo '$''{'ac_cv_func_wait3_rusage'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1965,1971 ----
  
  
  echo $ac_n "checking for wait3 that fills in rusage""... $ac_c" 1>&6
! echo "configure:1969: checking for wait3 that fills in rusage" >&5
  if eval "test \"`echo '$''{'ac_cv_func_wait3_rusage'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1957,1963 ****
    ac_cv_func_wait3_rusage=no
  else
    cat > conftest.$ac_ext <<EOF
! #line 1961 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/time.h>
--- 1973,1979 ----
    ac_cv_func_wait3_rusage=no
  else
    cat > conftest.$ac_ext <<EOF
! #line 1977 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/time.h>
***************
*** 1988,1994 ****
    }
  }
  EOF
! if { (eval echo configure:1992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_wait3_rusage=yes
  else
--- 2004,2010 ----
    }
  }
  EOF
! if { (eval echo configure:2008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_wait3_rusage=yes
  else
***************
*** 2013,2024 ****
  for ac_func in gethostname mkdir select socket strtol
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2017: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2022 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 2029,2040 ----
  for ac_func in gethostname mkdir select socket strtol
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2033: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2038 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
***************
*** 2041,2047 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:2045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 2057,2063 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:2061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
***************
*** 2068,2079 ****
  for ac_func in drand48
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2072: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2077 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 2084,2095 ----
  for ac_func in drand48
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2088: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2093 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
***************
*** 2096,2102 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:2100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 2112,2118 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:2116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
***************
*** 2123,2134 ****
  for ac_func in perror
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2127: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2132 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 2139,2150 ----
  for ac_func in perror
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2143: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2148 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
***************
*** 2151,2157 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:2155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 2167,2173 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:2171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
***************
*** 2178,2189 ****
  for ac_func in closesocket setsockopt send recv
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2182: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2187 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 2194,2205 ----
  for ac_func in closesocket setsockopt send recv
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2198: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2203 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
***************
*** 2206,2212 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:2210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 2222,2228 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:2226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
***************
*** 2231,2242 ****
  done
  
  echo $ac_n "checking for setpgrp""... $ac_c" 1>&6
! echo "configure:2235: checking for setpgrp" >&5
  if eval "test \"`echo '$''{'ac_cv_func_setpgrp'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2240 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char setpgrp(); below.  */
--- 2247,2258 ----
  done
  
  echo $ac_n "checking for setpgrp""... $ac_c" 1>&6
! echo "configure:2251: checking for setpgrp" >&5
  if eval "test \"`echo '$''{'ac_cv_func_setpgrp'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2256 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char setpgrp(); below.  */
***************
*** 2259,2265 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:2263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_setpgrp=yes"
  else
--- 2275,2281 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:2279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_setpgrp=yes"
  else
***************
*** 2279,2285 ****
  fi
  
  echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6
! echo "configure:2283: checking whether setpgrp takes no argument" >&5
  if eval "test \"`echo '$''{'ac_cv_func_setpgrp_void'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 2295,2301 ----
  fi
  
  echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6
! echo "configure:2299: checking whether setpgrp takes no argument" >&5
  if eval "test \"`echo '$''{'ac_cv_func_setpgrp_void'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 2287,2293 ****
    { echo "configure: error: cannot check setpgrp if cross compiling" 1>&2; exit 1; }
  else
    cat > conftest.$ac_ext <<EOF
! #line 2291 "configure"
  #include "confdefs.h"
  
  #ifdef HAVE_UNISTD_H
--- 2303,2309 ----
    { echo "configure: error: cannot check setpgrp if cross compiling" 1>&2; exit 1; }
  else
    cat > conftest.$ac_ext <<EOF
! #line 2307 "configure"
  #include "confdefs.h"
  
  #ifdef HAVE_UNISTD_H
***************
*** 2307,2313 ****
  }
  
  EOF
! if { (eval echo configure:2311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_setpgrp_void=no
  else
--- 2323,2329 ----
  }
  
  EOF
! if { (eval echo configure:2327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_setpgrp_void=no
  else
***************
*** 2331,2336 ****
--- 2347,2370 ----
  fi
  
  
+ LIBTOOL=
+ A=a
+ if test "$use_sharedlib" != no ; then
+     if test -x /usr/local/bin/libtool ; then
+         LIBTOOL=/usr/local/bin/libtool
+         A=la
+     fi
+     case $hosttype in
+     "NetBSD")
+         if test -x /usr/pkg/bin/libtool ; then
+             LIBTOOL=/usr/pkg/bin/libtool
+             A=la
+         fi
+     ;;
+     esac
+ fi
+ 
+ 
  
  trap '' 1 2 15
  cat > confcache <<\EOF
***************
*** 2477,2482 ****
--- 2511,2518 ----
  s%@CCOPTIONS@%$CCOPTIONS%g
  s%@CDEBUGFLAGS@%$CDEBUGFLAGS%g
  s%@LIBOBJS@%$LIBOBJS%g
+ s%@LIBTOOL@%$LIBTOOL%g
+ s%@A@%$A%g
  
  CEOF
  EOF
diff -rc FreeWnn-1.1.1-a017/Xsi/configure.in FreeWnn-1.1.1-a017-shared/Xsi/configure.in
*** FreeWnn-1.1.1-a017/Xsi/configure.in	Fri Mar 17 01:15:32 2000
--- FreeWnn-1.1.1-a017-shared/Xsi/configure.in	Wed Jul 26 13:25:03 2000
***************
*** 49,54 ****
--- 49,66 ----
  AC_SUBST(abs_top_srcdir)
  
  
+ dnl ====================================================================
+ dnl Check optional features
+ dnl ====================================================================
+ AC_ARG_ENABLE(sharedlib,
+ [  --enable-sharedlib      build shared library using GNU libtool],
+  [if test "$enableval" = yes
+   then
+     use_sharedlib=yes
+   else
+     use_sharedlib=no
+   fi], [use_sharedlib=default])
+ 
  
  dnl
  dnl Checks for cc and cpp.
***************
*** 280,285 ****
--- 292,318 ----
  AC_CHECK_FUNC(setpgrp)
  AC_FUNC_SETPGRP
  
+ dnl
+ dnl Checks for GNU libtool.
+ dnl
+ LIBTOOL=
+ A=a
+ if test "$use_sharedlib" != no ; then
+     if test -x /usr/local/bin/libtool ; then
+         LIBTOOL=/usr/local/bin/libtool
+         A=la
+     fi
+     case $hosttype in
+     "NetBSD")
+         if test -x /usr/pkg/bin/libtool ; then
+             LIBTOOL=/usr/pkg/bin/libtool
+             A=la
+         fi
+     ;;
+     esac
+ fi
+ AC_SUBST(LIBTOOL)
+ AC_SUBST(A)
  
  dnl
  dnl Creating Makefiles.
diff -rc FreeWnn-1.1.1-a017/Xsi/kWnn/jlib/Makefile.in FreeWnn-1.1.1-a017-shared/Xsi/kWnn/jlib/Makefile.in
*** FreeWnn-1.1.1-a017/Xsi/kWnn/jlib/Makefile.in	Tue Mar 21 01:21:12 2000
--- FreeWnn-1.1.1-a017-shared/Xsi/kWnn/jlib/Makefile.in	Wed Jul 26 14:51:51 2000
***************
*** 86,96 ****
  
  .c.o:
  	$(RM) $@
! 	$(CC) -c $(CFLAGS) $(_NOOP_) $*.c
  
  clean::
  
! all:: $(LINKS) $(OBJS) libkwnn.a
  
  includes:: $(LINKS)
  
--- 86,98 ----
  
  .c.o:
  	$(RM) $@
! 	$(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $*.c
  
  clean::
+ 	$(RM) -r .libs
+ 	$(RM) *.lo *.la
  
! all:: $(LINKS) $(OBJS) libkwnn.$(A)
  
  includes:: $(LINKS)
  
***************
*** 158,169 ****
  lint1:
  	$(LINT) $(LINTFLAGS) $(FILE) $(LINTLIBS)
  
! all:: libkwnn.a
  
! libkwnn.a: $(OBJS) $(EXTRALIBRARYDEPS)
  	$(RM) $@
! 	$(AR) $@ $(OBJS)
! 	$(RANLIB) $@
  
  lintlib:: llib-lkwnn.ln
  
--- 160,175 ----
  lint1:
  	$(LINT) $(LINTFLAGS) $(FILE) $(LINTLIBS)
  
! all:: libkwnn.$(A)
  
! libkwnn.$(A): $(OBJS) $(EXTRALIBRARYDEPS)
  	$(RM) $@
! 	@if [ "$(A)" = "a" ] ; then \
! 		$(AR) $@ $(OBJS) ; \
! 		$(RANLIB) $@ ; \
! 	else \
! 		$(LIBTOOL) $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(DESTDIR)$(WNNLIBDIR) -version-info $(KWNNJLIBVERSION) ; \
! 	fi
  
  lintlib:: llib-lkwnn.ln
  
***************
*** 173,204 ****
  
  instlib:: install
  
! install:: libkwnn.a
  	@if [ -d $(DESTDIR)$(WNNLIBDIR) ]; then set +x; \
  	else (set -x; $(MKDIRHIER) $(DESTDIR)$(WNNLIBDIR)); fi
! 	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) libkwnn.a $(DESTDIR)$(WNNLIBDIR)
! 	$(RANLIB) $(RANLIBINSTFLAGS) $(DESTDIR)$(WNNLIBDIR)/libkwnn.a
  
  $(OBJ3) : $(SRC3)
! 	$(CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ4) : $(SRC4)
! 	$(CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ5) : $(SRC5)
! 	$(CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ6) : $(SRC6)
! 	$(CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ7) : $(SRC7)
! 	$(CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ8) : $(SRC8)
! 	$(CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ9) : $(SRC9)
! 	$(CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
  
  $(LOCAL_RKOBJS) : $(LOCAL_RKSRCS)
  	@case '${MFLAGS}' in *[ik]*) set +e;; esac; 	cd $(KWNNROMKANSRC); echo "making all in $(KWNNROMKANSRC)"; 	$(MAKE) 'CDEBUGFLAGS=$(CDEBUGFLAGS)' $(MFLAGS)
--- 179,212 ----
  
  instlib:: install
  
! install:: libkwnn.$(A)
  	@if [ -d $(DESTDIR)$(WNNLIBDIR) ]; then set +x; \
  	else (set -x; $(MKDIRHIER) $(DESTDIR)$(WNNLIBDIR)); fi
! 	$(LIBTOOL) $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) libkwnn.$(A) $(DESTDIR)$(WNNLIBDIR)
! 	if [ "$(A)" = "a" ] ; then \
! 		$(RANLIB) $(RANLIBINSTFLAGS) $(DESTDIR)$(WNNLIBDIR)/libkwnn.$(A) ; \
! 	fi
  
  $(OBJ3) : $(SRC3)
! 	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ4) : $(SRC4)
! 	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ5) : $(SRC5)
! 	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ6) : $(SRC6)
! 	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ7) : $(SRC7)
! 	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ8) : $(SRC8)
! 	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
  
  $(OBJ9) : $(SRC9)
! 	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
  
  $(LOCAL_RKOBJS) : $(LOCAL_RKSRCS)
  	@case '${MFLAGS}' in *[ik]*) set +e;; esac; 	cd $(KWNNROMKANSRC); echo "making all in $(KWNNROMKANSRC)"; 	$(MAKE) 'CDEBUGFLAGS=$(CDEBUGFLAGS)' $(MFLAGS)
diff -rc FreeWnn-1.1.1-a017/Xsi/kWnn/jserver/Makefile.in FreeWnn-1.1.1-a017-shared/Xsi/kWnn/jserver/Makefile.in
*** FreeWnn-1.1.1-a017/Xsi/kWnn/jserver/Makefile.in	Tue Mar 21 01:21:12 2000
--- FreeWnn-1.1.1-a017-shared/Xsi/kWnn/jserver/Makefile.in	Wed Jul 26 14:38:56 2000
***************
*** 90,102 ****
  
  clean::
  	$(RM) kserver
  
  instserver:: install
  
  install:: kserver
  	@if [ -d $(DESTDIR)$(KWNNBINDIR) ]; then set +x; \
  	else (set -x; $(MKDIRHIER) $(DESTDIR)$(KWNNBINDIR)); fi
! 	$(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) kserver $(DESTDIR)$(KWNNBINDIR)/kserver
  
  includes:: $(HDRS) $(SRC0) $(SRC1)
  
--- 90,104 ----
  
  clean::
  	$(RM) kserver
+ 	$(RM) -r .libs
+ 	$(RM) *.lo *.la
  
  instserver:: install
  
  install:: kserver
  	@if [ -d $(DESTDIR)$(KWNNBINDIR) ]; then set +x; \
  	else (set -x; $(MKDIRHIER) $(DESTDIR)$(KWNNBINDIR)); fi
! 	$(LIBTOOL) $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) kserver $(DESTDIR)$(KWNNBINDIR)/kserver
  
  includes:: $(HDRS) $(SRC0) $(SRC1)
  
diff -rc FreeWnn-1.1.1-a017/Xsi/kWnn/jutil/Makefile.in FreeWnn-1.1.1-a017-shared/Xsi/kWnn/jutil/Makefile.in
*** FreeWnn-1.1.1-a017/Xsi/kWnn/jutil/Makefile.in	Sun Jan 30 16:02:26 2000
--- FreeWnn-1.1.1-a017-shared/Xsi/kWnn/jutil/Makefile.in	Wed Jul 26 14:34:31 2000
***************
*** 105,169 ****
  
  all:: $(PROGRAMS)
  
  katod: $(OBJATOD)
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOD) @LIBS@
  
  clean::
  	$(RM) katod
  
  katof: $(OBJATOF)
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOF) @LIBS@
  
  clean::
  	$(RM) katof
  
  kwnntouch: $(OBJTOUCH)
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJTOUCH) @LIBS@
  
  clean::
  	$(RM) kwnntouch
  
  kdicsort: $(OBJSORT)
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJSORT)
  
  clean::
  	$(RM) kdicsort
  
  kdtoa: $(OBJDTOA)
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJDTOA) @LIBS@
  
  clean::
  	$(RM) kdtoa
  
  kwnnstat: $(OBJSTAT) $(KWNNJLIB)
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJSTAT) $(KWNNJLIB) @LIBS@
  
  clean::
  	$(RM) kwnnstat
  
  kwnnkill: $(OBJKILL) $(KWNNJLIB)
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJKILL) $(KWNNJLIB) @LIBS@
  
  clean::
  	$(RM) kwnnkill
  
  kwddel: $(OBJWDDEL) $(KWNNJLIB)
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDDEL) $(KWNNJLIB) @LIBS@
  
  clean::
  	$(RM) kwddel
  
  kwdreg: $(OBJWDREG) $(KWNNJLIB)
  	$(RM) $@
! 	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDREG) $(KWNNJLIB) @LIBS@
  
  clean::
  	$(RM) kwdreg
--- 105,173 ----
  
  all:: $(PROGRAMS)
  
+ clean::
+ 	$(RM) -r .libs
+ 	$(RM) *.lo *.la
+ 
  katod: $(OBJATOD)
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOD) @LIBS@
  
  clean::
  	$(RM) katod
  
  katof: $(OBJATOF)
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOF) @LIBS@
  
  clean::
  	$(RM) katof
  
  kwnntouch: $(OBJTOUCH)
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJTOUCH) @LIBS@
  
  clean::
  	$(RM) kwnntouch
  
  kdicsort: $(OBJSORT)
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJSORT)
  
  clean::
  	$(RM) kdicsort
  
  kdtoa: $(OBJDTOA)
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJDTOA) @LIBS@
  
  clean::
  	$(RM) kdtoa
  
  kwnnstat: $(OBJSTAT) $(KWNNJLIB)
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJSTAT) $(KWNNJLIB) @LIBS@
  
  clean::
  	$(RM) kwnnstat
  
  kwnnkill: $(OBJKILL) $(KWNNJLIB)
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJKILL) $(KWNNJLIB) @LIBS@
  
  clean::
  	$(RM) kwnnkill
  
  kwddel: $(OBJWDDEL) $(KWNNJLIB)
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDDEL) $(KWNNJLIB) @LIBS@
  
  clean::
  	$(RM) kwddel
  
  kwdreg: $(OBJWDREG) $(KWNNJLIB)
  	$(RM) $@
! 	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDREG) $(KWNNJLIB) @LIBS@
  
  clean::
  	$(RM) kwdreg
***************
*** 321,327 ****
  	@for flag in ${MAKEFLAGS} ''; do \
  	case "$$flag" in *=*) ;; *[i]*) set +e;; esac; done; \
  	for i in $(PROGRAMS); do \
! 	(set -x; $(INSTALL) $(INSTALLFLAGS)  $$i $(DESTDIR)$(KWNNBINDIR)); \
  	done
  
  $(OBJ1) : $(SRC1)
--- 325,331 ----
  	@for flag in ${MAKEFLAGS} ''; do \
  	case "$$flag" in *=*) ;; *[i]*) set +e;; esac; done; \
  	for i in $(PROGRAMS); do \
! 	(set -x; $(LIBTOOL) $(INSTALL) $(INSTALLFLAGS)  $$i $(DESTDIR)$(KWNNBINDIR)); \
  	done
  
  $(OBJ1) : $(SRC1)
diff -rc FreeWnn-1.1.1-a017/Xsi/kWnn/romkan/Makefile.in FreeWnn-1.1.1-a017-shared/Xsi/kWnn/romkan/Makefile.in
*** FreeWnn-1.1.1-a017/Xsi/kWnn/romkan/Makefile.in	Sun Jan 30 15:50:24 2000
--- FreeWnn-1.1.1-a017-shared/Xsi/kWnn/romkan/Makefile.in	Wed Jul 26 13:58:19 2000
***************
*** 53,61 ****
  
  .c.o:
  	$(RM) $@
! 	$(CC) -c $(CFLAGS) $(_NOOP_) $*.c
  
  clean::
  
  all:: $(HDRS) $(SRCS) $(OBJS)
  
--- 53,63 ----
  
  .c.o:
  	$(RM) $@
! 	$(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $*.c
  
  clean::
+ 	$(RM) -r .libs
+ 	$(RM) *.lo *.la
  
  all:: $(HDRS) $(SRCS) $(OBJS)
  
diff -rc FreeWnn-1.1.1-a017/Xsi/makerule.mk.in FreeWnn-1.1.1-a017-shared/Xsi/makerule.mk.in
*** FreeWnn-1.1.1-a017/Xsi/makerule.mk.in	Sun Feb 13 18:15:54 2000
--- FreeWnn-1.1.1-a017-shared/Xsi/makerule.mk.in	Wed Jul 26 14:17:50 2000
***************
*** 68,73 ****
--- 68,76 ----
             RANLIB = @RANLIB@
    RANLIBINSTFLAGS =
  
+           LIBTOOL = @LIBTOOL@
+                 A = @A@
+ 
                 RM = rm -f
                TBL = tbl
  
***************
*** 145,151 ****
     WNNCNVFILEDIR = $(WNNJDSRC)/./bsd
      WNNINCLUDES = -I$(WNNINCLUDESRC) -I$(WNNROMKANMSRC)
       WNNDEFINES = -DLIBDIR=\"$(WNNWNNDIR)\"
!         WNNJLIB = $(WNNJLIBSRC)/libwnn.a
       WNNCONVLIB = $(WNNCONVSRC)/libconvkey.a
  
          CWNNTOP = $(IMTOP)/cWnn
--- 148,155 ----
     WNNCNVFILEDIR = $(WNNJDSRC)/./bsd
      WNNINCLUDES = -I$(WNNINCLUDESRC) -I$(WNNROMKANMSRC)
       WNNDEFINES = -DLIBDIR=\"$(WNNWNNDIR)\"
!         WNNJLIB = $(WNNJLIBSRC)/libwnn.$(A)
!  WNNJLIBVERSION = 0:0
       WNNCONVLIB = $(WNNCONVSRC)/libconvkey.a
  
          CWNNTOP = $(IMTOP)/cWnn
***************
*** 168,174 ****
   CWNNCNVFILEDIR = $(CWNNCDSRC)/./bsd
     CWNNINCLUDES = -I$(CWNNINCLUDESRC) -I$(CWNNROMKANMSRC)
      CWNNDEFINES = -DLIBDIR=\"$(WNNWNNDIR)\"
!        CWNNJLIB = $(CWNNJLIBSRC)/libcwnn.a
      CWNNCONVLIB = $(CWNNCONVSRC)/libconvkey.a
  
          KWNNTOP = $(IMTOP)/kWnn
--- 172,179 ----
   CWNNCNVFILEDIR = $(CWNNCDSRC)/./bsd
     CWNNINCLUDES = -I$(CWNNINCLUDESRC) -I$(CWNNROMKANMSRC)
      CWNNDEFINES = -DLIBDIR=\"$(WNNWNNDIR)\"
!        CWNNJLIB = $(CWNNJLIBSRC)/libcwnn.$(A)
! CWNNJLIBVERSION = 0:0
      CWNNCONVLIB = $(CWNNCONVSRC)/libconvkey.a
  
          KWNNTOP = $(IMTOP)/kWnn
***************
*** 191,197 ****
   KWNNCNVFILEDIR = $(KWNNCDSRC)/./bsd
     KWNNINCLUDES = -I$(KWNNINCLUDESRC) -I$(KWNNROMKANMSRC)
      KWNNDEFINES = -DLIBDIR=\"$(WNNWNNDIR)\"
!        KWNNJLIB = $(KWNNJLIBSRC)/libkwnn.a
      KWNNCONVLIB = $(KWNNCONVSRC)/libconvkey.a
  
         TWNNLANG = zh_TW
--- 196,203 ----
   KWNNCNVFILEDIR = $(KWNNCDSRC)/./bsd
     KWNNINCLUDES = -I$(KWNNINCLUDESRC) -I$(KWNNROMKANMSRC)
      KWNNDEFINES = -DLIBDIR=\"$(WNNWNNDIR)\"
!        KWNNJLIB = $(KWNNJLIBSRC)/libkwnn.$(A)
! KWNNJLIBVERSION = 0:0
      KWNNCONVLIB = $(KWNNCONVSRC)/libconvkey.a
  
         TWNNLANG = zh_TW