[21.5 AC sjt-xft] Disable Canna+MC_ALLOC until crash is fixed
21.5 APPROVE COMMIT sjt-xft
This is the promised patch to make it hard (maybe impossible without
patching configure.ac) to configure --with-canna --enable-mc-alloc.
I've tested all nine possibilities (default, yes, no)^2 and they all
configure as desired.
If you want the version that allows you to build with both Canna and
MC_ALLOC for debugging purposes, use the -r canna-mc-alloc-crash tag
when updating.
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v
retrieving revision 1.418.2.17
diff -u -r1.418.2.17 ChangeLog
--- ChangeLog 24 Sep 2005 14:02:11 -0000 1.418.2.17
+++ ChangeLog 24 Sep 2005 14:30:01 -0000
＠＠ -0,0 +1,4 ＠＠
+2005-09-22 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * configure.ac (Canna): Disable if MC_ALLOC is enabled.
+
Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.1.14.13
diff -u -r1.1.14.13 configure.ac
--- configure.ac 24 Sep 2005 14:02:12 -0000 1.1.14.13
+++ configure.ac 24 Sep 2005 14:30:02 -0000
＠＠ -4400,13 +4400,18 ＠＠
test -z "$with_canna" && {
AC_CHECK_LIB(canna,jrKanjiControl,[:],with_canna=no) }
test -z "$with_canna" && with_canna=yes
if test "$with_canna" = "yes"; then
- AC_DEFINE(HAVE_CANNA)
- XE_APPEND(modules/canna, MAKE_SUBDIR)
- need_modules_common=yes
- if test "$with_modules" = "yes"; then
- XE_APPEND(modules/canna, INSTALL_ARCH_DEP_SUBDIR)
+ if test "$enable_mc_alloc" = "yes"; then
+ dnl #### REMOVE THIS BRANCH WHEN CANNA_MC_ALLOC CONFLICT IS FIXED ####
+ with_canna=disabled
+ else
+ AC_DEFINE(HAVE_CANNA)
+ XE_APPEND(modules/canna, MAKE_SUBDIR)
+ need_modules_common=yes
+ if test "$with_modules" = "yes"; then
+ XE_APPEND(modules/canna, INSTALL_ARCH_DEP_SUBDIR)
+ fi
+ XE_PREPEND(-lcanna -lRKC, canna_libs)
fi
- XE_PREPEND(-lcanna -lRKC, canna_libs)
fi
AC_SUBST(canna_libs)
＠＠ -5837,6 +5842,13 ＠＠
test "$with_xim" = xlib && echo " - Using raw Xlib to provide
XIM support."
test "$with_xfs" = yes && echo " - Using XFontSet to provide
bilingual menubar."
test "$with_canna" = yes && echo " Compiling in support for Canna
on Mule."
+if test "$with_canna" = disabled; then
+ echo " WARNING: ---------------------------------------------------------"
+ echo " WARNING: Canna found but disabled due to conflict with MC_ALLOC!"
+ echo " WARNING: To configure with Canna you must use --disable-mc-alloc."
+ echo " WARNING: If you don't know what Canna is, you don't need
it."
+ echo " WARNING: ---------------------------------------------------------"
+fi
if test "$with_wnn" = yes; then
echo " Compiling in support for the WNN input method on Mule."
test "$with_wnn6" = yes && echo " - Using WNN version
6."
--
School of Systems and Information Engineering http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Ask not how you can "do" free software business;
ask what your business can "do for" free software.