CVS update by stephent xemacs/modules/canna ...
xemacs-cvs at xemacs.org
xemacs-cvs at xemacs.org
Thu Feb 15 11:12:19 EST 2007
User: stephent
Date: 07/02/15 17:12:19
Modified: xemacs/modules/canna canna_api.c
Log:
Adapt canna autodetection to current reality. <878xeze6qj.fsf at uwakimon.sk.tsukuba.ac.jp>
Revision Changes Path
1.522 +9 -0 XEmacs/xemacs/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v
retrieving revision 1.521
retrieving revision 1.522
diff -u -p -r1.521 -r1.522
--- ChangeLog 2007/02/14 07:35:07 1.521
+++ ChangeLog 2007/02/15 16:11:52 1.522
@@ -1,3 +1,12 @@
+2007-02-16 Stephen J. Turnbull <stephen at xemacs.org>
+
+ * configure.ac (canna):
+ Move #define of CANNA_NEW_WCHAR_AWARE to config.h.
+ Use -DCANNA_NEW_WCHAR_AWARE since check for RK.h fails otherwise.
+ Refactor into loops over orthogonal tweaks (prefix and define).
+ Use have_canna to track detection success, not with_canna.
+ Add AC_MSG_WARNs documenting autoconf's bogosity (ours, too).
+
2007-01-01 Malcolm Purvis <malcolmp at xemacs.org>
* aclocal.m4 (XE_SHLIB_STUFF): Use $EGREP instead of egrep.
1.55 +32 -16 XEmacs/xemacs/configure.ac
Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- configure.ac 2006/12/28 12:56:04 1.54
+++ configure.ac 2007/02/15 16:11:52 1.55
@@ -4594,35 +4594,51 @@ if test "$enable_mule" = "yes" ; then
fi
fi
- dnl Autodetect canna
+ dnl Configure canna
dnl canna_libs variable is initialized at toplevel
- canna_includes_found=no
+ dnl #### the hard-coding of /usr/local/canna/include is bogus and
+ dnl my Mac OS X 10.4 system needs /usr/local/canna/lib, too
+ dnl #### this whole mess should be in modules/canna, no? maybe not
+ have_canna=no
if test "$with_canna" != "no"; then
- AC_CHECK_HEADER(canna/jrkanji.h,canna_includes_found=yes)
- fi
- if test "$canna_includes_found" = "no" -a "$with_canna" != "no" -a \
- -d "/usr/local/canna/include"; then
save_c_switch_site="$c_switch_site"
- c_switch_site="$c_switch_site -I/usr/local/canna/include"
- AC_CHECK_HEADER(canna/jrkanji.h,canna_includes_found=yes)
- if test "$canna_includes_found" != "yes"; then
+ for canna_include_path in "" " -I/usr/local/canna/include"; do
+ for canna_wchar_aware in "" " -DCANNA_NEW_WCHAR_AWARE=1"; do
+ c_switch_site="$save_c_switch_site$canna_include_path$canna_wchar_aware"
+ # defeat autoconf's cache mechanism
+ $as_unset ac_cv_header_canna_jrkanji_h
+ $as_unset ac_cv_header_canna_RK_h
+ # using $ac_header_compiler is a hack, but autoconf doesn't let us
+ # get at this information otherwise :-(
+ AC_CHECK_HEADER(canna/jrkanji.h,[AC_CHECK_HEADER(canna/RK.h,have_canna=$ac_header_compiler)])
+ test "$have_canna" = "yes" && break
+ AC_MSG_WARN([You may ignore any *Present but not compiled* message
+ from autoconf. We detect that condition and recheck, but there
+ is no way to suppress autoconf's message.])
+ done
+ test "$have_canna" = "yes" && break
+ done
+ if test "$have_canna" = "yes"; then
+ c_switch_site="$save_c_switch_site$canna_include_path"
+ else
c_switch_site="$save_c_switch_site"
- with_canna="no"
fi
fi
- test -z "$with_canna" && { AC_CHECK_HEADER(canna/RK.h, , with_canna=no) }
- test -z "$with_canna" && { AC_CHECK_LIB(RKC, RkBgnBun, [:],with_canna=no) }
- 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
+ test "$have_canna" = "yes" && { AC_CHECK_LIB(RKC, RkBgnBun, [:],have_canna=no) }
+ test "$have_canna" = "yes" && { AC_CHECK_LIB(canna,jrKanjiControl,[:],have_canna=no) }
+ if test "$have_canna" = "yes"; then
AC_DEFINE(HAVE_CANNA)
+ test -n "$canna_wchar_aware" && AC_DEFINE(CANNA_NEW_WCHAR_AWARE)
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)
+ elif test "$with_canna" != "no"; then
+ AC_MSG_WARN([Canna configuration failed. If you expected success,
+maybe you need --with-site-prefixes=/usr/local/canna?])
fi
AC_SUBST(canna_libs)
@@ -6098,7 +6114,7 @@ test "$with_xim" != no && echo " Compil
test "$with_xim" = motif && echo " - Using Motif to provide XIM support."
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."
+test "$have_canna" = yes && echo " Compiling in support for Canna on Mule."
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.292 +48 -170 XEmacs/xemacs/configure
Index: configure
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -p -r1.291 -r1.292
--- configure 2007/01/01 10:03:53 1.291
+++ configure 2007/02/15 16:11:52 1.292
@@ -28680,156 +28680,18 @@ _ACEOF
fi
fi
- canna_includes_found=no
+ have_canna=no
if test "$with_canna" != "no"; then
- if test "${ac_cv_header_canna_jrkanji_h+set}" = set; then
- echo "$as_me:$LINENO: checking for canna/jrkanji.h" >&5
-echo $ECHO_N "checking for canna/jrkanji.h... $ECHO_C" >&6
-if test "${ac_cv_header_canna_jrkanji_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_canna_jrkanji_h" >&5
-echo "${ECHO_T}$ac_cv_header_canna_jrkanji_h" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking canna/jrkanji.h usability" >&5
-echo $ECHO_N "checking canna/jrkanji.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <canna/jrkanji.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking canna/jrkanji.h presence" >&5
-echo $ECHO_N "checking canna/jrkanji.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <canna/jrkanji.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: canna/jrkanji.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: canna/jrkanji.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: canna/jrkanji.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: canna/jrkanji.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: canna/jrkanji.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: canna/jrkanji.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: canna/jrkanji.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: canna/jrkanji.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: canna/jrkanji.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: canna/jrkanji.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: canna/jrkanji.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: canna/jrkanji.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: canna/jrkanji.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: canna/jrkanji.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: canna/jrkanji.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: canna/jrkanji.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------- ##
-## Report this to xemacs-beta at xemacs.org ##
-## ------------------------------------- ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for canna/jrkanji.h" >&5
-echo $ECHO_N "checking for canna/jrkanji.h... $ECHO_C" >&6
-if test "${ac_cv_header_canna_jrkanji_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_canna_jrkanji_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_canna_jrkanji_h" >&5
-echo "${ECHO_T}$ac_cv_header_canna_jrkanji_h" >&6
-
-fi
-if test $ac_cv_header_canna_jrkanji_h = yes; then
- canna_includes_found=yes
-fi
-
-
- fi
- if test "$canna_includes_found" = "no" -a "$with_canna" != "no" -a \
- -d "/usr/local/canna/include"; then
save_c_switch_site="$c_switch_site"
- c_switch_site="$c_switch_site -I/usr/local/canna/include"
- if test "${ac_cv_header_canna_jrkanji_h+set}" = set; then
+ for canna_include_path in "" " -I/usr/local/canna/include"; do
+ for canna_wchar_aware in "" " -DCANNA_NEW_WCHAR_AWARE=1"; do
+ c_switch_site="$save_c_switch_site$canna_include_path$canna_wchar_aware"
+ # defeat autoconf's cache mechanism
+ $as_unset ac_cv_header_canna_jrkanji_h
+ $as_unset ac_cv_header_canna_RK_h
+ # using $ac_header_compiler is a hack, but autoconf doesn't let us
+ # get at this information otherwise :-(
+ if test "${ac_cv_header_canna_jrkanji_h+set}" = set; then
echo "$as_me:$LINENO: checking for canna/jrkanji.h" >&5
echo $ECHO_N "checking for canna/jrkanji.h... $ECHO_C" >&6
if test "${ac_cv_header_canna_jrkanji_h+set}" = set; then
@@ -28967,17 +28829,7 @@ echo "${ECHO_T}$ac_cv_header_canna_jrkan
fi
if test $ac_cv_header_canna_jrkanji_h = yes; then
- canna_includes_found=yes
-fi
-
-
- if test "$canna_includes_found" != "yes"; then
- c_switch_site="$save_c_switch_site"
- with_canna="no"
- fi
- fi
-
- test -z "$with_canna" && { if test "${ac_cv_header_canna_RK_h+set}" = set; then
+ if test "${ac_cv_header_canna_RK_h+set}" = set; then
echo "$as_me:$LINENO: checking for canna/RK.h" >&5
echo $ECHO_N "checking for canna/RK.h... $ECHO_C" >&6
if test "${ac_cv_header_canna_RK_h+set}" = set; then
@@ -29115,13 +28967,31 @@ echo "${ECHO_T}$ac_cv_header_canna_RK_h"
fi
if test $ac_cv_header_canna_RK_h = yes; then
-:
-else
- with_canna=no
+ have_canna=$ac_header_compiler
fi
- }
- test -z "$with_canna" && { echo "$as_me:$LINENO: checking for RkBgnBun in -lRKC" >&5
+
+fi
+
+
+ test "$have_canna" = "yes" && break
+ { echo "$as_me:$LINENO: WARNING: You may ignore any *Present but not compiled* message
+ from autoconf. We detect that condition and recheck, but there
+ is no way to suppress autoconf's message." >&5
+echo "$as_me: WARNING: You may ignore any *Present but not compiled* message
+ from autoconf. We detect that condition and recheck, but there
+ is no way to suppress autoconf's message." >&2;}
+ done
+ test "$have_canna" = "yes" && break
+ done
+ if test "$have_canna" = "yes"; then
+ c_switch_site="$save_c_switch_site$canna_include_path"
+ else
+ c_switch_site="$save_c_switch_site"
+ fi
+ fi
+
+ test "$have_canna" = "yes" && { echo "$as_me:$LINENO: checking for RkBgnBun in -lRKC" >&5
echo $ECHO_N "checking for RkBgnBun in -lRKC... $ECHO_C" >&6
if test "${ac_cv_lib_RKC_RkBgnBun+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29188,10 +29058,10 @@ echo "${ECHO_T}$ac_cv_lib_RKC_RkBgnBun"
if test $ac_cv_lib_RKC_RkBgnBun = yes; then
:
else
- with_canna=no
+ have_canna=no
fi
}
- test -z "$with_canna" && { echo "$as_me:$LINENO: checking for jrKanjiControl in -lcanna" >&5
+ test "$have_canna" = "yes" && { echo "$as_me:$LINENO: checking for jrKanjiControl in -lcanna" >&5
echo $ECHO_N "checking for jrKanjiControl in -lcanna... $ECHO_C" >&6
if test "${ac_cv_lib_canna_jrKanjiControl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29258,21 +29128,29 @@ echo "${ECHO_T}$ac_cv_lib_canna_jrKanjiC
if test $ac_cv_lib_canna_jrKanjiControl = yes; then
:
else
- with_canna=no
+ have_canna=no
fi
}
- test -z "$with_canna" && with_canna=yes
- if test "$with_canna" = "yes"; then
+ if test "$have_canna" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_CANNA 1
_ACEOF
+ test -n "$canna_wchar_aware" && cat >>confdefs.h <<\_ACEOF
+#define CANNA_NEW_WCHAR_AWARE 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
+ elif test "$with_canna" != "no"; then
+ { echo "$as_me:$LINENO: WARNING: Canna configuration failed. If you expected success,
+maybe you need --with-site-prefixes=/usr/local/canna?" >&5
+echo "$as_me: WARNING: Canna configuration failed. If you expected success,
+maybe you need --with-site-prefixes=/usr/local/canna?" >&2;}
fi
@@ -39908,7 +39786,7 @@ test "$with_xim" != no && echo " Compil
test "$with_xim" = motif && echo " - Using Motif to provide XIM support."
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."
+test "$have_canna" = yes && echo " Compiling in support for Canna on Mule."
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.61 +5 -0 XEmacs/xemacs/modules/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/ChangeLog,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- ChangeLog 2007/02/08 21:26:03 1.60
+++ ChangeLog 2007/02/15 16:12:12 1.61
@@ -1,3 +1,8 @@
+2007-02-16 Stephen J. Turnbull <stephen at xemacs.org>
+
+ * canna/canna_api.c: Move CANNA_NEW_WCHAR_AWARE to config.h.
+ Clean up ancient cruft for IROHA (Canna v.1) support.
+
2007-02-08 Adrian Aichner <adrian at xemacs.org>
* postgresql/postgresql.c: Update Steve L. Baur's address on his
1.1044 +5 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.1043
retrieving revision 1.1044
diff -u -p -r1.1043 -r1.1044
--- ChangeLog 2007/02/06 20:01:40 1.1043
+++ ChangeLog 2007/02/15 16:12:13 1.1044
@@ -1,3 +1,8 @@
+2007-02-16 Stephen J. Turnbull <stephen at xemacs.org>
+
+ * config.h.in: Move CANNA_NEW_WCHAR_AWARE here from canna_api.c.
+ Remove crufty CANNA2 define, we can't support CANNA1 (IROHA).
+
2007-02-06 Aidan Kehoe <kehoea at parhasard.net>
* specifier.c (setup_device_initial_specifier_tags):
1.111 +1 -1 XEmacs/xemacs/src/config.h.in
Index: config.h.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/config.h.in,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- config.h.in 2006/12/11 19:44:56 1.110
+++ config.h.in 2007/02/15 16:12:14 1.111
@@ -677,6 +677,7 @@ things are arranged in config.h.in. In
/* Non-XIM input methods for use with Mule. */
#undef HAVE_CANNA
+#undef CANNA_NEW_WCHAR_AWARE
#undef HAVE_WNN
#undef WNN6
@@ -1046,7 +1047,6 @@ extern "C" {
#endif
#ifdef HAVE_CANNA
-# define CANNA2
# define CANNA_MULE
# define CANNA_PURESIZE 0
#else /* not CANNA */
1.4 +4 -7 XEmacs/xemacs/modules/canna/canna_api.c
Index: canna_api.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/canna/canna_api.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- canna_api.c 2005/11/16 07:14:16 1.3
+++ canna_api.c 2007/02/15 16:12:19 1.4
@@ -161,17 +161,14 @@ Boston, MA 02111-1307, USA. */
#include "buffer.h"
#include "file-coding.h"
-#ifdef CANNA2
+/* iroha (Canna v1) support removed as of canna_api.c r1.4.
+ #### Is the IROHA_BC #define needed? */
#define IROHA_BC
-#define CANNA_NEW_WCHAR_AWARE
#include "canna/jrkanji.h"
#include "canna/RK.h"
-#else /* !CANNA2 */
-#include "iroha/jrkanji.h"
-#include "iroha/RK.h"
-#endif /* !CANNA2 */
-extern char *jrKanjiError;
+/* #### These shouldn't be needed any more. */
+extern char *jrKanjiError;
extern int (*jrBeepFunc) (void);
/* #### is this global really necessary? */
More information about the XEmacs-CVS
mailing list