User: stephent Date: 05/09/24 17:16:20 Branch: xemacs sjt-xft Modified: xemacs ChangeLog configure configure.ac Log: Disable Canna when MC_ALLOC is configured. <87zmq2cyj2.fsf(a)tleepslib.sk.tsukuba.ac.jp&gt; Revision Changes Path 1.418.2.18 +4 -0 XEmacs/xemacs/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.418.2.17 retrieving revision 1.418.2.18 diff -u -p -r1.418.2.17 -r1.418.2.18 --- ChangeLog 2005/09/24 14:02:11 1.418.2.17 +++ ChangeLog 2005/09/24 15:15:30 1.418.2.18 ＠＠ -1,5 +1,9 ＠＠ 2005-09-22 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + * configure.ac (Canna): Disable if MC_ALLOC is enabled. + +2005-09-22 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + * configure.ac (Canna): Configure as module if appropriate. * Makefile.in.in (modules/canna): Add dependency on lib-src (ellcc). 1.232.2.14 +17 -6 XEmacs/xemacs/configure Index: configure =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v retrieving revision 1.232.2.13 retrieving revision 1.232.2.14 diff -u -p -r1.232.2.13 -r1.232.2.14 --- configure 2005/09/24 14:58:28 1.232.2.13 +++ configure 2005/09/24 15:15:31 1.232.2.14 ＠＠ -27708,16 +27708,20 ＠＠ fi } test -z "$with_canna" && with_canna=yes if test "$with_canna" = "yes"; then - cat >>confdefs.h <<\_ACEOF + if test "$enable_mc_alloc" = "yes"; then + with_canna=disabled + else + cat >>confdefs.h <<\_ACEOF #define HAVE_CANNA 1 _ACEOF - MAKE_SUBDIR="$MAKE_SUBDIR modules/canna" && if test "$verbose" = "yes"; then echo " Appending \"modules/canna\" to \$MAKE_SUBDIR"; fi - need_modules_common=yes - if test "$with_modules" = "yes"; then - INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/canna" && if test "$verbose" = "yes"; then echo " Appending \"modules/canna\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi + MAKE_SUBDIR="$MAKE_SUBDIR modules/canna" && if test "$verbose" = "yes"; then echo " Appending \"modules/canna\" to \$MAKE_SUBDIR"; fi + need_modules_common=yes + if test "$with_modules" = "yes"; then + INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/canna" && if test "$verbose" = "yes"; then echo " Appending \"modules/canna\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi + fi + canna_libs="-lcanna -lRKC $canna_libs" && if test "$verbose" = "yes"; then echo " Prepending \"-lcanna -lRKC\" to \$canna_libs"; fi fi - canna_libs="-lcanna -lRKC $canna_libs" && if test "$verbose" = "yes"; then echo " Prepending \"-lcanna -lRKC\" to \$canna_libs"; fi fi ＠＠ -37234,6 +37238,13 ＠＠ test "$with_xim" = motif && echo " - 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." 1.1.14.14 +18 -6 XEmacs/xemacs/configure.ac Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.1.14.13 retrieving revision 1.1.14.14 diff -u -p -r1.1.14.13 -r1.1.14.14 --- configure.ac 2005/09/24 14:02:12 1.1.14.13 +++ configure.ac 2005/09/24 15:16:01 1.1.14.14 ＠＠ -4400,13 +4400,18 ＠＠ if test "$enable_mule" = "yes" ; then 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" = motif && echo " - 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."