From owner-ports-jp@jp.freebsd.org  Fri Sep  8 16:41:05 2000
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id QAA70138;
	Fri, 8 Sep 2000 16:41:05 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from diana.infonets.hiroshima-u.ac.jp (diana.infonets.hiroshima-u.ac.jp [133.41.33.53])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id QAA70133
	for <ports-jp@jp.freebsd.org>; Fri, 8 Sep 2000 16:41:04 +0900 (JST)
	(envelope-from taoka@infonets.hiroshima-u.ac.jp)
Received: from peg.infonets.hiroshima-u.ac.jp (peg.infonets.hiroshima-u.ac.jp [133.41.33.64])
	by diana.infonets.hiroshima-u.ac.jp (8.9.3/3.7W) with ESMTP id QAA86864;
	Fri, 8 Sep 2000 16:39:46 +0900 (JST)
Received: from localhost (localhost.infonets.hiroshima-u.ac.jp [127.0.0.1]) by peg.infonets.hiroshima-u.ac.jp (8.9.3/3.6W) with ESMTP
	id QAA10698; Fri, 8 Sep 2000 16:41:23 +0900 (JST)
To: ports-jp@jp.freebsd.org
Cc: Kazuyuki IENAGA <ienaga@jsys.co.jp>
From: TAOKA Satoshi <taoka@infonets.hiroshima-u.ac.jp>
In-Reply-To: <20000908150638Y.taoka@infonets.hiroshima-u.ac.jp>
References: <200009080217.e882H6G87049@pis.toba-cmt.ac.jp>
	<20000908112430Z.taoka@infonets.hiroshima-u.ac.jp>
	<20000908150638Y.taoka@infonets.hiroshima-u.ac.jp>
X-Mailer: Mew version 1.94.2 on XEmacs 21.1 (Canyonlands)
X-Prom-Mew: Prom-Mew 1.93.4 (procmail reader for Mew)
X-URL: http://www.infonets.hiroshima-u.ac.jp/~taoka/
Mime-Version: 1.0
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Message-Id: <20000908164123B.taoka@infonets.hiroshima-u.ac.jp>
Date: Fri, 08 Sep 2000 16:41:23 +0900
X-Dispatcher: imput version 20000228(IM140)
Lines: 94
Reply-To: ports-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+000315
X-Sequence: ports-jp 10000
Subject: [ports-jp 10000] Wnn6-lib v.s. FreeWnn && XEmacs (Re: FreeWnn-lib, FreeWnn-server)
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org
X-Originator: taoka@infonets.hiroshima-u.ac.jp


Cc: $B2H1J$5$s!"$7$F$$$^$9(B

$BED2,$G$9!#(B

Wnn6-lib$B$H(BFreeWnn$B$N%i%$%V%i%j$H(BXEmacs$B$N(Bconfigure$B$K$D$$$F$G$9!#(BWnn6-lib$B$H(B
FreeWnn$B$H$b$K(Bshared lib$B$r:n$k$h$&$K$J$C$?$N$G!"8=>u$G$O>/$7LdBj$,5/$j$^(B
$B$9!#(BWnn6-lib$B$H(BFreeWnn-lib$B$r$$$l$?>uBV$G!"(B--with-wnn6=yes$B$H$7$F$b(B
FreeWnn$B$N$b$N$r%j%s%/$7$F$7$^$$$^$9!#$H$$$&$3$H$G!"JQ99$7$J$1$l$P$J$j$^(B
$B$;$s!#(B

$B8=:_!"(Bconfigure.in$B$G(B

    AC_CHECK_LIB(wnn,jl_dic_list_e,libwnn=wnn,
      AC_CHECK_LIB(wnn4,jl_dic_list_e,libwnn=wnn4,
	AC_CHECK_LIB(wnn6,jl_dic_list_e,libwnn=wnn6,
	  AC_CHECK_LIB(wnn6_fromsrc,dic_list_e,libwnn=wnn6_fromsrc,with_wnn=no))))

$B$H$7$F$$$^$9$,!"$3$l$G$O(B--with-wnn6=yes$B$H$7$F!"$+$D!"(BFreeWnn$B$N(Blibwnn$B$,(B
$BB8:_$7$F$$$?$H$-$K$O!"$&$^$/F0:n$7$^$;$s!#$=$3$G!"$b$C$H!"(B--with-wnn6=yes
$B$N;XDj$N0UL#$r6/$a$k$N$,NI$$$H;W$o$l$^$9!#J}?K$O$3$&$G$9!#(B

$B$b$7!"(B--with-wnn6=yes $B$rM?$($i$l$?$i!'(B
  -lwnn6, -lwnn6_fromsrc, -lwnn $B$N=g$K!"(Bjl_fi_dic_list_e$B!J"+(BWnn4,
  FreeWnn$B$K$O$J$$4X?t!K$rC5$7!"$9$Y$F$G8+$D$+$i$J$1$l$P(B with_wnn6=no;
  with_wnn=no $B$H$9$k!#(Bwith_wnn=no$B$H$7$?$N$O!"2<<j$K(BWnn6$B$r4|BT$7$F$$$k$N(B
  $B$K(BWnn4, FreeWnn$B$N$b$N$r%j%s%/$7$F$7$^$&$H!"4V0c$$$,J,$+$j$K$/$$$+$i$G(B
  $B$9!#$H$$$&$N$O!"(BWnn4, FreeWnn$B$N$b$N$G$b0l1~(BWnn6$B$N(Bjserver$B$K7R$2$k$3$H$,(B
  $B$G$-$?$O$:$@$+$i$G$9!J$?$V$s!K!#(B

$B$=$&$G$J$$>l9g!'(B
  $B=>MhDL$N=gHV$GC5$9!#$?$@$7!"(Bwnn6, wnn6_fromsrc$B$N;~$O!"(B
  jl_fi_dic_list_e $B$r;H$&!#(B

$B$H$$$&$N$O$I$&$G$7$g$&!#<B:]$K$O"-$N%Q%C%A$r8+$F$/$@$5$$!#$J$*!""-$O>e$N(B
$B$b$N$r4^$a$?(Bconfigure$B$K4X$9$kJQ99$G$9!J(BXEmacs$B$N(Bports$B$GEv$k%Q%C%A$G$9!K!#(B
db.h$B$NJQ99$O$J$<$+$OJ,$+$j$^$;$s$,!J$?$V$s(B-I/usr/local/include$B$N;XDj$,$"(B
$B$k$H$-$K$b!"(B/usr/include$B$N$b$N$r;H$&$H$$$&;v$J$N$+$b!K!"(B
*-*-freebsd* ) opsys=freebsd ;;
$B$NDI2C$OI,MW$@$H;W$o$l$^$9!#(B

--- configure.in.orig	Fri Aug  4 11:49:59 2000
+++ configure.in	Fri Sep  8 16:12:55 2000
@@ -1053,6 +1053,7 @@
 dnl Straightforward OS determination
 case "$canonical" in
   *-*-linux*    ) opsys=linux ;;
+  *-*-freebsd* ) opsys=freebsd ;;
   *-*-netbsd*   ) opsys=netbsd ;;
   *-*-openbsd*	) opsys=openbsd ;;
   *-*-nextstep* ) opsys=nextstep ;;
@@ -3052,21 +3053,24 @@
     test "$ac_cv_func_crypt" != "yes" && { AC_CHECK_LIB(crypt, crypt) }
   fi
   dnl Back to our regularly scheduled wnn hunting
-  if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
-    AC_CHECK_LIB(wnn,jl_dic_list_e,libwnn=wnn,
-      AC_CHECK_LIB(wnn4,jl_dic_list_e,libwnn=wnn4,
-	AC_CHECK_LIB(wnn6,jl_dic_list_e,libwnn=wnn6,
-	  AC_CHECK_LIB(wnn6_fromsrc,dic_list_e,libwnn=wnn6_fromsrc,with_wnn=no))))
+  if test "$with_wnn6" = "yes"; then
+    AC_CHECK_LIB(wnn6,jl_fi_dic_list_e,libwnn=wnn6,
+      AC_CHECK_LIB(wnn6_fromsrc,jl_fi_dic_list_e,libwnn=wnn6_fromsrc,
+	AC_CHECK_LIB(wnn,jl_fi_dic_list_e,libwnn=wnn, [with_wnn6=no; with_wnn=no])))
+  else
+    if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
+      AC_CHECK_LIB(wnn,jl_dic_list_e,libwnn=wnn,
+	AC_CHECK_LIB(wnn4,jl_dic_list_e,libwnn=wnn4,
+	  AC_CHECK_LIB(wnn6,jl_fi_dic_list_e,[libwnn=wnn6; with_wnn6=yes],
+	    AC_CHECK_LIB(wnn6_fromsrc,jl_fi_dic_list_e, [libwnn=wnn6_fromsrc; with_wnn6=yes],with_wnn=no))))
+    fi
   fi
   test -z "$with_wnn" && with_wnn=yes
   if test "$with_wnn" = "yes"; then
     AC_DEFINE(HAVE_WNN)
     XE_PREPEND(-l$libwnn, libs_x)
     XE_ADD_OBJS(mule-wnnfns.o)
-    if test "$with_wnn6" != "no"; then
-      AC_CHECK_LIB($libwnn, jl_fi_dic_list, with_wnn6=yes)
-      test "$with_wnn6" = "yes" && AC_DEFINE(WNN6)
-    fi
+    test "$with_wnn6" = "yes" && AC_DEFINE(WNN6)
   fi
 
   dnl Autodetect canna
@@ -3579,7 +3583,7 @@
 dnl Check for Berkeley DB.
 if test "$with_database_berkdb" != "no"; then
   AC_MSG_CHECKING(for Berkeley db.h)
-  for path in "db/db.h" "db.h"; do
+  for path in "/usr/include/db.h" "db/db.h" "db.h"; do
     AC_TRY_COMPILE([
 #include <stdlib.h>
 #if !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1)
