diff options
| author | Akinori MUSHA <knu@FreeBSD.org> | 2000-10-24 10:53:40 +0000 |
|---|---|---|
| committer | Akinori MUSHA <knu@FreeBSD.org> | 2000-10-24 10:53:40 +0000 |
| commit | 5d0b8890005b5403ac4370572167e00703901184 (patch) | |
| tree | 9438b5c03e692fadb454fcf5b7dcb26b8a2c6187 /editors/xemacs/files | |
| parent | Add $MASTER_SITE_RINGSERVER into $MASTER_SITES. (diff) | |
Enable XIM support by default.
Reflect Wnn4 -> FreeWnn change.
Fix build problems.
PR: ports/21549
Submitted by: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
Notes
Notes:
svn path=/head/; revision=34176
Diffstat (limited to 'editors/xemacs/files')
| -rw-r--r-- | editors/xemacs/files/patch-aa | 11 | ||||
| -rw-r--r-- | editors/xemacs/files/patch-af | 54 |
2 files changed, 55 insertions, 10 deletions
diff --git a/editors/xemacs/files/patch-aa b/editors/xemacs/files/patch-aa new file mode 100644 index 000000000000..45fbafd60623 --- /dev/null +++ b/editors/xemacs/files/patch-aa @@ -0,0 +1,11 @@ +--- lib-src/Makefile.in.in~ Tue Feb 8 11:54:39 2000 ++++ lib-src/Makefile.in.in Thu Sep 21 22:26:13 2000 +@@ -224,7 +224,7 @@ + (cd ${archlibdir} && \ + $(RM) ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}) + +-.PHONY: mostlyclean clean distclean realclean extraclean ++.PHONY: mostlyclean clean distclean realclean extraclean ${archlibdir} + mostlyclean: + $(RM) *.o *.i core + clean: mostlyclean diff --git a/editors/xemacs/files/patch-af b/editors/xemacs/files/patch-af index 8021b4053971..90ca0820e9aa 100644 --- a/editors/xemacs/files/patch-af +++ b/editors/xemacs/files/patch-af @@ -1,19 +1,53 @@ ---- configure.orig Fri Aug 4 11:49:54 2000 -+++ configure Mon Aug 7 22:38:52 2000 -@@ -1042,6 +1042,7 @@ - +--- 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 ;; -@@ -11407,7 +11408,7 @@ +@@ -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 - echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6 - echo "configure:11410: checking for Berkeley db.h" >&5 + 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 - cat > conftest.$ac_ext <<EOF - #line 11413 "configure" - #include "confdefs.h" + AC_TRY_COMPILE([ + #include <stdlib.h> + #if !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1) |