From owner-ports-jp@jp.freebsd.org  Sat Oct 10 01:10:42 1998
Received: (from daemon@localhost)
	by jaz.jp.freebsd.org (8.9.1+3.1W/8.7.3) id BAA02182;
	Sat, 10 Oct 1998 01:10:42 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from pis.toba-cmt.ac.jp (pis.toba-cmt.ac.jp [202.26.248.77])
	by jaz.jp.freebsd.org (8.9.1+3.1W/8.7.3) with ESMTP id BAA02170
	for <ports-jp@jp.freebsd.org>; Sat, 10 Oct 1998 01:10:39 +0900 (JST)
	(envelope-from kiri@pis.toba-cmt.ac.jp)
Received: from localhost (localhost.pis [127.0.0.1])
	by pis.toba-cmt.ac.jp (8.9.1/8.8.8) with ESMTP id BAA21956
	for <ports-jp@jp.freebsd.org>; Sat, 10 Oct 1998 01:19:27 +0900 (JST)
	(envelope-from kiri@pis.toba-cmt.ac.jp)
To: ports-jp@jp.freebsd.org
In-Reply-To: Your message of "Fri, 09 Oct 1998 17:45:29 +0900"
	<19981009174529A.kiri@pis.toba-cmt.ac.jp>
References: <19981009174529A.kiri@pis.toba-cmt.ac.jp>
X-Mailer: Mew version 1.93 on XEmacs 20.4 (Emerald)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Message-Id: <19981010011927L.kiri@pis.toba-cmt.ac.jp>
Date: Sat, 10 Oct 1998 01:19:27 +0900
From: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
X-Dispatcher: imput version 980905(IM100)
Lines: 101
Reply-To: ports-jp@jp.freebsd.org
Precedence: bulk
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+980914
X-Sequence: ports-jp 4773
Subject: [ports-jp 4773] Re: Can't set --sitelispdir in XEmacs!
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org

$B6M;3(B $B$G$9!#(B

$B;d!'(B
> $B$7$F$^$9$,!"(B${PREFIX}/lib/xemacs-20.4/site-lisp $B$@$1$G$J$/(B
> ${PREFIX}/share/emacs/site-lisp $B$bMx$$$F$J$$$G$9$M!#62$i$/(B
> editors/xemacs20 $B$G$bF1$8$@$H;W$$$^$9!#(Bsitelispdir $B$b%O!<%I%3!<%H$5$l$F(B
> $B$k$N$+$J$!!#$I$J$+$?2r7h:v$r8f;}$A$NJ}65$($F$$$?$@$1$l$P$"$j$,$?$$$N$G$9(B
> $B$,(B...$B!#(B

$B$H$j$"$($:2r7h$7$^$7$?(B :-)$B!#(Bsrc/paths.h $B$N(B PATH_LOADSEARCH $B$K@_Dj$9$l$P(B
$BNI$$$_$?$$$G$9!#(Bports $BE*$K$O"-$N$h$&$K$7$^$7$?!#(B

editors/xemacs-mule/Makefile:($BDI2C(B)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
CONFIGURE_ARGS=--sitelispdir=${PREFIX}/lib/xemacs-20.4/lisp:${PREFIX}/lib/xemacs-20.4/site-lisp:${PREFIX}/lib/xemacs/site-lisp:${PREFIX}/share/emacs/site-lisp

editors/xemacs-mule-common/patches/patch-ab:($BDI2C(B)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--- configure.in.orig	Tue Feb 10 12:58:57 1998
+++ configure.in	Fri Oct  9 22:42:15 1998
@@ -335,6 +335,7 @@
 lispdir='${datadir}/xemacs-${version}/lisp'
 lispdir_user_defined='no'
 sitelispdir='${datadir}/xemacs/site-lisp'
+sitelispdir_user_defined='no'
 etcdir='${datadir}/xemacs-${version}/etc'
 etcdir_user_defined='no'
 lockdir='${statedir}/xemacs/lock'
@@ -682,6 +683,7 @@
            dnl of etcdir and lispdir.  Changing statedir will change the
            dnl default value of lockdir.
            case "$opt" in
+             sitelispdir ) sitelispdir_user_defined=yes ;;
              lispdir ) lispdir_user_defined=yes ;;
              etcdir  )  etcdir_user_defined=yes ;;
              infodir ) infodir_user_defined=yes ;;
@@ -2573,7 +2575,9 @@
     AC_DEFINE(HAVE_WNN)
     XE_PREPEND(-lwnn, libs_x)
     XE_ADD_OBJS(mule-wnnfns.o)
-    AC_CHECK_LIB(wnn, jl_fi_dic_list, with_wnn6=yes)
+    if test "$with_wnn6" != "no"; then
+      AC_CHECK_LIB(wnn, jl_fi_dic_list, with_wnn6=yes)
+    fi
     test "$with_wnn6" = "yes" && AC_DEFINE(WNN6)
   fi
 
@@ -3037,6 +3041,11 @@
   if test "$need_libdb" != "no"; then
     AC_CHECK_LIB(db, dbopen, with_database_berkdb=yes need_libdb=yes)
     fi
+  dnl try to figure out if Berkeley DB 2 (db_open) had been installed.
+  dnl or do we better to check (#if DB_VERSION_MAJOR == 2)?
+  if test "$with_database_berkdb" = "yes"; then
+    AC_CHECK_LIB(db, db_open, with_database_berkdb=yes need_libdb=yes)
+  fi
   if test "$with_database_berkdb" = "yes"; then
     for path in "db/db.h" "db.h"; do
 AC_TRY_COMPILE([#ifdef HAVE_INTTYPES_H
@@ -3180,6 +3189,7 @@
 AC_SUBST(lispdir)
 AC_SUBST(lispdir_user_defined)
 AC_SUBST(sitelispdir)
+AC_SUBST(sitelispdir_user_defined)
 AC_SUBST(etcdir)
 AC_SUBST(etcdir_user_defined)
 AC_SUBST(lockdir)

editors/xemacs-mule-common/patches/patch-ad:($B?75,(B)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--- Makefile.in~	Thu Feb 19 11:14:30 1998
+++ Makefile.in	Fri Oct  9 22:38:45 1998
@@ -155,6 +155,10 @@
 ## directories.
 sitelispdir=@sitelispdir@
 
+## This is set to 'yes' if the user specified the --lispdir or
+## --datadir flag at configuration time.
+sitelispdir_user_defined=@sitelispdir_user_defined@
+
 ## Where XEmacs will search for its lisp files while
 ## building.  This is only used during the process of
 ## compiling XEmacs, to help XEmacs find its lisp files
@@ -295,9 +299,9 @@
 	@cp ${srcdir}/src/paths.h.in src/paths.h.tmp
 	@-chmod 0644 src/paths.h.tmp
 	@(echo '#define PATH_PREFIX "${prefix}"'; \
-	 if test "${lispdir_user_defined}" = "yes"; \
-	   then echo    '#define PATH_LOADSEARCH "${lispdir}"'; \
-	   else echo '/* #define PATH_LOADSEARCH "${lispdir}" */'; \
+	 if test "${sitelispdir_user_defined}" = "yes"; \
+	   then echo    '#define PATH_LOADSEARCH "${sitelispdir}"'; \
+	   else echo '/* #define PATH_LOADSEARCH "${sitelispdir}" */'; \
 	 fi; \
 	 if test "${archlibdir_user_defined}" = "yes"; \
 	   then echo    '#define PATH_EXEC "${archlibdir}"'; \

$B!t(B $B$9$Y$j9~$_%;!<%U$G(B send-pr $B$G$-$^$7$?!#(B
---
KIRIYAMA Kazuhiko
kiri@pis.toba-cmt.ac.jp
