Mercurial > hg > xemacs-beta

comparison configure.ac @ 2973:414a64af46c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2005-10-04 17:51:13 by stephent] Modularize Canna <87wtkttbvp.fsf@tleepslib.sk.tsukuba.ac.jp>
author stephent
date Tue, 04 Oct 2005 17:51:32 +0000
parents 3ee1c468b215
children fd7c5f4f2983
comparison
equal deleted inserted replaced
2972:2b58b7fd831c 2973:414a64af46c9
4199 4199
4200 if test "$enable_default_eol_detection" = "yes"; then 4200 if test "$enable_default_eol_detection" = "yes"; then
4201 AC_DEFINE(HAVE_DEFAULT_EOL_DETECTION) 4201 AC_DEFINE(HAVE_DEFAULT_EOL_DETECTION)
4202 fi 4202 fi
4203 4203
4204 dnl initialize _libs variables for possible modules at top level
4205 canna_libs=
4206 wnn_libs=
4207
4204 if test "$enable_mule" = "yes" ; then 4208 if test "$enable_mule" = "yes" ; then
4205 AC_CHECKING([for Mule-related features]) 4209 AC_CHECKING([for Mule-related features])
4206 AC_DEFINE(MULE) 4210 AC_DEFINE(MULE)
4207 4211
4208 dnl Use -lintl to get internationalized strerror for Mule 4212 dnl Use -lintl to get internationalized strerror for Mule
4275 test "$with_wnn6" = "yes" && AC_DEFINE(WNN6) 4279 test "$with_wnn6" = "yes" && AC_DEFINE(WNN6)
4276 fi 4280 fi
4277 fi 4281 fi
4278 4282
4279 dnl Autodetect canna 4283 dnl Autodetect canna
4284 dnl canna_libs variable is initialized at toplevel
4280 canna_includes_found=no 4285 canna_includes_found=no
4281 if test "$with_canna" != "no"; then 4286 if test "$with_canna" != "no"; then
4282 AC_CHECK_HEADER(canna/jrkanji.h,canna_includes_found=yes) 4287 AC_CHECK_HEADER(canna/jrkanji.h,canna_includes_found=yes)
4283 fi 4288 fi
4284 if test "$canna_includes_found" = "no" -a "$with_canna" != "no" -a \ 4289 if test "$canna_includes_found" = "no" -a "$with_canna" != "no" -a \
4296 test -z "$with_canna" && { AC_CHECK_LIB(RKC, RkBgnBun, [:],with_canna=no) } 4301 test -z "$with_canna" && { AC_CHECK_LIB(RKC, RkBgnBun, [:],with_canna=no) }
4297 test -z "$with_canna" && { AC_CHECK_LIB(canna,jrKanjiControl,[:],with_canna=no) } 4302 test -z "$with_canna" && { AC_CHECK_LIB(canna,jrKanjiControl,[:],with_canna=no) }
4298 test -z "$with_canna" && with_canna=yes 4303 test -z "$with_canna" && with_canna=yes
4299 if test "$with_canna" = "yes"; then 4304 if test "$with_canna" = "yes"; then
4300 AC_DEFINE(HAVE_CANNA) 4305 AC_DEFINE(HAVE_CANNA)
4301 XE_PREPEND(-lcanna -lRKC, libs_x) 4306 XE_APPEND(modules/canna, MAKE_SUBDIR)
4302 fi 4307 need_modules_common=yes
4308 if test "$with_modules" = "yes"; then
4309 XE_APPEND(modules/canna, INSTALL_ARCH_DEP_SUBDIR)
4310 fi
4311 XE_PREPEND(-lcanna -lRKC, canna_libs)
4312 fi
4313 AC_SUBST(canna_libs)
4303 4314
4304 else dnl "$enable_mule" = "no" 4315 else dnl "$enable_mule" = "no"
4305 for feature in xim canna wnn; do 4316 for feature in xim canna wnn; do
4306 if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then 4317 if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then
4307 AC_MSG_WARN([--with-${feature} ignored: Not valid without Mule support]) 4318 AC_MSG_WARN([--with-${feature} ignored: Not valid without Mule support])
5148 dnl We ignore (C|LD)_SWITCH_X_(MACHINE|SYSTEM) 5159 dnl We ignore (C|LD)_SWITCH_X_(MACHINE|SYSTEM)
5149 dnl Use XE_SPACE instead of plain assignment statements to remove extraneous blanks 5160 dnl Use XE_SPACE instead of plain assignment statements to remove extraneous blanks
5150 if test "$enable_modules" = "yes"; then 5161 if test "$enable_modules" = "yes"; then
5151 ld_libs_module= 5162 ld_libs_module=
5152 else 5163 else
5153 XE_SPACE(ld_libs_module, $ldap_libs $postgresql_libs) 5164 XE_SPACE(ld_libs_module, $ldap_libs $postgresql_libs $canna_libs)
5154 fi 5165 fi
5155 5166
5156 XE_SPACE(CFLAGS, $CFLAGS) 5167 XE_SPACE(CFLAGS, $CFLAGS)
5157 XE_SPACE(extra_objs, $extra_objs) 5168 XE_SPACE(extra_objs, $extra_objs)
5158 XE_SPACE(c_switch_general, -DHAVE_CONFIG_H $c_switch_site $c_switch_machine $c_switch_system) 5169 XE_SPACE(c_switch_general, -DHAVE_CONFIG_H $c_switch_site $c_switch_machine $c_switch_system)