[AC21.5] Fix module name in "Modularize Canna support"

APPROVE COMMIT 21.5 As pointed out by Marcus Crestani, the name of the module must be a C identifier. This patch reverts to canna_api from canna-api. Marcus also pointed out that prepending "canna/" to the path being require'd in lisp/mule/canna-leim.el causes problems with loading the module. My local history indicates that was deliberate, so I'm not going to change that in this patch. I suspect it is related to run-in-place configuration. For Xft fans, I'll be also committing the corresponding patch to the sjt-xft branch in a day or so. Besides the patches attached below, this patch also renames `modules/canna/canna-api.c' to `modules/canna/canna_api.c'. Index: lisp/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v retrieving revision 1.684 diff -u -r1.684 ChangeLog --- lisp/ChangeLog 21 Oct 2005 10:34:34 -0000 1.684 +++ lisp/ChangeLog 21 Oct 2005 15:21:52 -0000 ＠＠ -0,0 +1,5 ＠＠ +2005-10-21 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + UNDO: + * mule/canna-leim.el: Rename canna_api to canna-api. + Index: modules/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/ChangeLog,v retrieving revision 1.44 diff -u -r1.44 ChangeLog --- modules/ChangeLog 21 Oct 2005 10:26:51 -0000 1.44 +++ modules/ChangeLog 21 Oct 2005 15:21:52 -0000 ＠＠ -0,0 +1,7 ＠＠ +2005-10-21 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + UNDO: + * canna/canna-api.c: + * canna/Makefile.in.in (MODNAME,SRCS): + Rename module from canna_api to canna-api. + Index: src/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.869 diff -u -U0 -r1.869 ChangeLog --- src/ChangeLog 21 Oct 2005 09:19:40 -0000 1.869 +++ src/ChangeLog 21 Oct 2005 15:28:28 -0000 ＠＠ -0,0 +1,4 ＠＠ +2005-10-21 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * Makefile.in.in (mule_canna_objs): Revert canna-api to canna_api. + Index: lisp/mule/canna-leim.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/canna-leim.el,v retrieving revision 1.8 diff -u -r1.8 canna-leim.el --- lisp/mule/canna-leim.el 4 Oct 2005 17:51:29 -0000 1.8 +++ lisp/mule/canna-leim.el 21 Oct 2005 15:21:52 -0000 ＠＠ -35,17 +35,17 ＠＠ (globally-declare-boundp 'canna:*japanese-mode*) (globally-declare-fboundp '(canna canna-toggle-japanese-mode)) -;; use (locate-file "canna/canna-api" module-load-path module-extensions) +;; use (locate-file "canna/canna_api" module-load-path module-extensions) ;; to locate the module without loading it. ;; then we could autoload canna-activate and dump and/or autoload: -;; (and (locate-file "canna/canna-api" module-load-path module-extensions) +;; (and (locate-file "canna/canna_api" module-load-path module-extensions) ;; (locate-library "canna") ;; (register-input-method 'japanese-canna "Japanese" 'canna-activate nil ;; "Canna - a kana to kanji conversion program")) (defun canna-activate (&optional name) ;; XEmacs 21.5.10 and later have 3-argument require. - (unless (require 'CANNA "canna/canna-api" 'no-error) + (unless (require 'CANNA "canna/canna_api" 'no-error) (error 'file-error "No Canna API support!? See M-x describe-installation & C-h v module-load-path.")) (unless (require 'canna nil 'no-error) Index: modules/canna/Makefile.in.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/canna/Makefile.in.in,v retrieving revision 1.2 diff -u -r1.2 Makefile.in.in --- modules/canna/Makefile.in.in 4 Oct 2005 17:51:32 -0000 1.2 +++ modules/canna/Makefile.in.in 21 Oct 2005 15:21:52 -0000 ＠＠ -26,11 +26,11 ＠＠ ## source tree. ### Specialize this part for your module -MODNAME=canna-api +MODNAME=canna_api MODVER=0.5.0 MODTITLE="Module wrapping Canna libraries for XEmacs" CFLAGS=＠CFLAGS＠ LDFLAGS=＠LDFLAGS＠ ＠ld_switch_all＠ ＠canna_libs＠ -SRCS=canna-api.c +SRCS=canna_api.c ## Note: modules/common/Makefile.common will be appended by configure Index: modules/canna/configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/canna/configure.ac,v retrieving revision 1.2 diff -u -r1.2 configure.ac --- modules/canna/configure.ac 4 Oct 2005 17:51:32 -0000 1.2 +++ modules/canna/configure.ac 21 Oct 2005 15:21:52 -0000 ＠＠ -2,7 +2,7 ＠＠ # This is only used for independent module building. AC_INIT([Sample module], [1.0], [xemacs-beta(a)xemacs.org]) AC_PREREQ(2.53) -AC_REVISION($Revision: 1.2 $) +AC_REVISION($Revision: 1.1.2.1 $) AC_COPYRIGHT([Configuration script for the sample module. Copyright (C) 2002 Jerry James. Index: src/Makefile.in.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Makefile.in.in,v retrieving revision 1.118 diff -u -r1.118 Makefile.in.in --- src/Makefile.in.in 4 Oct 2005 17:51:24 -0000 1.118 +++ src/Makefile.in.in 21 Oct 2005 15:21:53 -0000 ＠＠ -197,7 +197,7 ＠＠ #endif #if defined(HAVE_CANNA) && !defined(HAVE_SHLIB) -mule_canna_objs=$(BLDMODULES)/canna/canna-api.o +mule_canna_objs=$(BLDMODULES)/canna/canna_api.o #endif #ifdef HAVE_WNN -- 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.