freebsd-ports/editors/mule-common/files/patch-mm
Satoshi Taoka fb4902d214 Updated for the change of the following (1) and (2):
(1) {chinese,korean,japanese}/Wnn (Wnn 4.2) was updated as follows:

  (a) Its name was changed from Wnn to FreeWnn because Wnn6 which is a
      commercial software exits
  (b) Its license was changed to GPL.
  (c) The method to configure was changed from imake to GNU configure.
  (d) Relatively to the original Wnn, the Wnn in the ports tree were
      modified by me a lot. Most of the modifications were adopted
      into FreeWnn.
  (c) Header and library files are installed into
      ${LOCALBASE}/{lib,include} instead of ${X11BASE}/{lib,include}.

(2) FreeWnn is divided into two ports FreeWnn-lib and FreeWnn-server
in chinese, korean and japanese categories. The former is for libwnn
and header files to compile client commands, and the files used in
client commands.  The latter is for a server to convert KANA to KANJI
(Chinese character), and dictionaries and files used by the server.

Notice: I forgot to commit editors/mule*, too (^_^;;
2000-09-17 15:29:20 +00:00

68 lines
2.0 KiB
Plaintext

--- configure.orig Fri Sep 8 14:13:47 2000
+++ configure Fri Sep 8 14:15:09 2000
@@ -38,6 +38,10 @@
ac_help="$ac_help
--with-wnn6 Use Wnn6 library to input Japanese or Chinese"
ac_help="$ac_help
+ --with-cwnn4 Use Wnn4 library to input Chinese"
+ac_help="$ac_help
+ --with-kwnn4 Use Wnn4 library to input Korean"
+ac_help="$ac_help
--with-wnn-includes=DIR Search for WNN header files in DIR"
ac_help="$ac_help
--with-wnn-libraries=DIR Search for WNN libraries in DIR"
@@ -92,6 +96,7 @@
infodir='${prefix}/info'
mandir='${prefix}/man'
+wnnlib='-lwnn'
# Initialize some other variables.
subdirs=
MFLAGS= MAKEFLAGS=
@@ -564,11 +569,11 @@
emacs_prefix=emacs
lispdir='${datadir}/${emacs_prefix}/${version}/lisp'
locallisppath='${datadir}/${emacs_prefix}/${version}/site-lisp:'\
-'${datadir}/${emacs_prefix}/site-lisp'
+'${datadir}/${emacs_prefix}/site-lisp:${datadir}/emacs/site-lisp'
lisppath='${locallisppath}:${lispdir}'
etcdir='${datadir}/${emacs_prefix}/${version}/etc'
# share lockdir with emacs and mule.
-lockdir='${sharedstatedir}/emacs/lock'
+lockdir='/var/run/emacs/lock'
archlibdir='${libexecdir}/${emacs_prefix}/${version}/${configuration}'
docdir='${datadir}/${emacs_prefix}/${version}/etc'
@@ -671,9 +676,16 @@
fi
+if test "${with_cwnn4+set}" = set; then
+ wnnlib=-lcwnn
+elif test "${with_kwnn4+set}" = set; then
+ wnnlib=-lkwnn
+fi
+
# Check whether --with-wnn6 or --without-wnn6 was given.
if test "${with_wnn6+set}" = set; then
withval="$with_wnn6"
+ wnnlib=-lwnn6
with_wnn=${withval}; cat >> confdefs.h <<\EOF
#define WNN6 1
EOF
@@ -3104,12 +3116,12 @@
if test -n "${with_wnn_libraries}" ; then
if test -d ${with_wnn_libraries} ; then
LD_SWITCH_WNN="-L${with_wnn_libraries}"
- LIBS_MULE="${LIBS_MULE} -lwnn"
+ LIBS_MULE="${LIBS_MULE} ${wnnlib}"
else
LIBS_MULE="${LIBS_MULE} ${with_wnn_libraries}"
fi
else
- LIBS_MULE="${LIBS_MULE} -lwnn"
+ LIBS_MULE="${LIBS_MULE} ${wnnlib}"
fi
fi