User: stephent Date: 05/09/24 16:41:54 Branch: xemacs sjt-xft Modified: xemacs configure Log: won't work without thisautoconf Revision Changes Path 1.232.2.12 +26 -11 XEmacs/xemacs/configure Index: configure =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v retrieving revision 1.232.2.11 retrieving revision 1.232.2.12 diff -u -p -r1.232.2.11 -r1.232.2.12 --- configure 2005/09/20 16:04:32 1.232.2.11 +++ configure 2005/09/24 14:41:12 1.232.2.12 ＠＠ -356,7 +356,7 ＠＠ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS inststaticdir statedir LN_S blddir build build_cpu build_vendor build_os configuration CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP start_flags ld_switch_shared start_files ld lib_gcc RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA YACC SET_MAKE GTK_CONFIG X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS install_pp libs_xauth dnd_objs LIBSTDCPP dll_ld dll_cflags dll_ldflags dll_post dll_ldo ld_dynamic_link_flags with_modules MOD_CC MODARCHDIR MAKE_DOCFILE MODCFLAGS INSTALLPATH MOD_INSTALL_PROGRAM OBJECT_TO_BUILD ldap_libs postgresql_libs lwlib_objs ALLOCA have_esd_config SRC_SUBDIR_DEPS INSTALL_ARCH_DEP_SUBDIR MA! KE_SUBDIR SUBDIR_MAKEFILES PROGNAME version instvardir srcdir extra_includes PREFIX_USER_DEFINED PREFIX EXEC_PREFIX_USER_DEFINED EXEC_PREFIX INFODIR_USER_DEFINED INFODIR infopath INFOPATH_USER_DEFINED INFOPATH package_path PACKAGE_PATH_USER_DEFINED PACKAGE_PATH lispdir LISPDIR_USER_DEFINED LISPDIR moduledir MODULEDIR_USER_DEFINED MODULEDIR sitelispdir SITELISPDIR_USER_DEFINED SITELISPDIR sitemoduledir SITEMODULEDIR_USER_DEFINED SITEMODULEDIR etcdir ETCDIR_USER_DEFINED ETCDIR archlibdir ARCHLIBDIR_USER_DEFINED ARCHLIBDIR docdir DOCDIR_USER_DEFINED DOCDIR bitmapdir extra_objs machfile opsysfile c_switch_general c_switch_window_system c_switch_all ld_switch_general ld_switch_window_system ld_switch_all ld_libs_general ld_libs_window_system ld_libs_all RECURSIVE_MAKE_ARGS native_sound_lib sound_cflags dynodump_arch XEMACS_CC XE_CFLAGS internal_makefile_list LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS inststaticdir statedir LN_S blddir build build_cpu build_vendor build_os configuration CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP start_flags ld_switch_shared start_files ld lib_gcc RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA YACC SET_MAKE GTK_CONFIG X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS install_pp libs_xauth dnd_objs LIBSTDCPP dll_ld dll_cflags dll_ldflags dll_post dll_ldo ld_dynamic_link_flags with_modules MOD_CC MODARCHDIR MAKE_DOCFILE MODCFLAGS INSTALLPATH MOD_INSTALL_PROGRAM OBJECT_TO_BUILD ldap_libs postgresql_libs lwlib_objs canna_libs ALLOCA have_esd_config SRC_SUBDIR_DEPS INSTALL_ARCH_DE! P_SUBDIR MAKE_SUBDIR SUBDIR_MAKEFILES PROGNAME version instvardir srcdir extra_includes PREFIX_USER_DEFINED PREFIX EXEC_PREFIX_USER_DEFINED EXEC_PREFIX INFODIR_USER_DEFINED INFODIR infopath INFOPATH_USER_DEFINED INFOPATH package_path PACKAGE_PATH_USER_DEFINED PACKAGE_PATH lispdir LISPDIR_USER_DEFINED LISPDIR moduledir MODULEDIR_USER_DEFINED MODULEDIR sitelispdir SITELISPDIR_USER_DEFINED SITELISPDIR sitemoduledir SITEMODULEDIR_USER_DEFINED SITEMODULEDIR etcdir ETCDIR_USER_DEFINED ETCDIR archlibdir ARCHLIBDIR_USER_DEFINED ARCHLIBDIR docdir DOCDIR_USER_DEFINED DOCDIR bitmapdir extra_objs machfile opsysfile c_switch_general c_switch_window_system c_switch_all ld_switch_general ld_switch_window_system ld_switch_all ld_libs_general ld_libs_window_system ld_libs_all RECURSIVE_MAKE_ARGS native_sound_lib sound_cflags dynodump_arch XEMACS_CC XE_CFLAGS internal_makefile_list LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. ＠＠ -22173,6 +22173,7 ＠＠ echo "$as_me: checking for graphics libr xpm_problem="" if test -z "$with_xpm"; then CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi + XE_CFLAGS=""$incpath_xpm" $XE_CFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$XE_CFLAGS"; fi LDFLAGS=""$libpath_xpm" $LDFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi echo "$as_me:$LINENO: checking for Xpm - no older than 3.4f" >&5 echo $ECHO_N "checking for Xpm - no older than 3.4f... $ECHO_C" >&6 ＠＠ -22248,6 +22249,7 ＠＠ _ACEOF LDFLAGS=""$libpath_xpm" $LDFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi libs_x="-lXpm $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lXpm\" to \$libs_x"; fi CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi + XE_CFLAGS=""$incpath_xpm" $XE_CFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$XE_CFLAGS"; fi echo "$as_me:$LINENO: checking for \"FOR_MSW\" xpm" >&5 echo $ECHO_N "checking for \"FOR_MSW\" xpm... $ECHO_C" >&6 xe_check_libs=-lXpm ＠＠ -27122,7 +27124,8 ＠＠ _ACEOF fi fi - canna_includes_found=no + canna_libs= + canna_includes_found=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 ＠＠ -27705,13 +27708,23 ＠＠ 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 - libs_x="-lcanna -lRKC $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lcanna -lRKC\" to \$libs_x"; 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 fi + else for feature in xim canna wnn; do if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then { echo "$as_me:$LINENO: WARNING: --with-${feature} ignored: Not valid without Mule support" >&5 ＠＠ -37033,13 +37046,7 ＠＠ fi ( echo " -XEmacs ${emacs_major_version}.${emacs_minor_version}${xemacs_betaname} \"$xemacs_codename\" $xemacs_extra_name configured for \`$ac_cv_build'. -" -echo " WARNING: --------------------------------------------------------------" -echo " WARNING: This was produced from a new autoconf-2.5 based configuration." -echo " WARNING: If this configuration seems buggy then copy etc/configure-2.13" -echo " WARNING: to configure and try again. Also please report the bug." -echo " WARNING: --------------------------------------------------------------" +XEmacs ${emacs_major_version}.${emacs_minor_version}${xemacs_betaname} \"$xemacs_codename\" $xemacs_extra_name configured for \`$ac_cv_build'." echo " Compilation Environment and Installation Defaults:" ＠＠ -37231,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." ＠＠ -38013,6 +38027,7 ＠＠ s,＠OBJECT_TO_BUILD＠,$OBJECT_TO_BUILD,;t s,＠ldap_libs＠,$ldap_libs,;t t s,＠postgresql_libs＠,$postgresql_libs,;t t s,＠lwlib_objs＠,$lwlib_objs,;t t +s,＠canna_libs＠,$canna_libs,;t t s,＠ALLOCA＠,$ALLOCA,;t t s,＠have_esd_config＠,$have_esd_config,;t t s,＠SRC_SUBDIR_DEPS＠,$SRC_SUBDIR_DEPS,;t t