User: stephent Date: 05/09/24 16:59:07 Branch: xemacs sjt-xft Modified: xemacs configure Log: won't work without thisautoconf 2d try Revision Changes Path 1.232.2.13 +6 -17 XEmacs/xemacs/configure Index: configure =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v retrieving revision 1.232.2.12 retrieving revision 1.232.2.13 diff -u -p -r1.232.2.12 -r1.232.2.13 --- configure 2005/09/24 14:41:12 1.232.2.12 +++ configure 2005/09/24 14:58:28 1.232.2.13 ＠＠ -27708,20 +27708,16 ＠＠ fi } test -z "$with_canna" && with_canna=yes if test "$with_canna" = "yes"; then - if test "$enable_mc_alloc" = "yes"; then - with_canna=disabled - else - cat >>confdefs.h <<\_ACEOF + 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 - fi - canna_libs="-lcanna -lRKC $canna_libs" && if test "$verbose" = "yes"; then echo " Prepending \"-lcanna -lRKC\" to \$canna_libs"; 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 ＠＠ -37238,13 +37234,6 ＠＠ 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."