21.5 configure.ac thinks it should look for MSW xpm

Jerry, With the latest round of changes to configure.ac, the 21.5 configure script gets confused on my home machine and thinks that FOR_MSW should be set. Here is the failure: gcc -c -Wall -Wno-switch -Wundef -Wsign-compare -Wno-char-subscripts -Wpacked -Wunused-parameter -g -Demacs -I. -I/home/acs/xemacs-21.5-2006-03-28/src -DHAVE_CONFIG_H -I/usr/X11R6/include balloon-x.c In file included from console-x.h:51, from console-x-impl.h:39, from balloon-x.c:28: /usr/include/X11/xpm.h:71:63: error: simx.h: No such file or directory make[1]: *** [balloon-x.o] Error 1 make[1]: Leaving directory `/home/acs/xemacs-21.5-2006-03-28/src' make: *** [src] Error 2 This failure is caused by this difference in src/config.h: /* Compile in support for X pixmaps via the `xpm' library? */ #define HAVE_XPM 1 -/* #undef FOR_MSW */ +#define FOR_MSW 1 /* Compile in support for "X faces" via the `compface' library? This enables graphical display of X-face headers in mail/news messages */ And this, in turn came about because of this change: ＠＠ -4001,9 +4012,9 ＠＠ XE_PREPEND(-lXpm, libs_x) XE_PREPEND("$incpath_xpm", CFLAGS) XE_PREPEND("$incpath_xpm", XE_CFLAGS) - AC_MSG_CHECKING(for \"FOR_MSW\" xpm) + AC_MSG_CHECKING([for "FOR_MSW" xpm]) xe_check_libs=-lXpm - AC_TRY_LINK(, [XpmCreatePixmapFromData()], + AC_LINK_IFELSE([AC_LANG_SOURCE([XpmCreatePixmapFromData()])], [xpm_for_msw=no], [xpm_for_msw=yes]) xe_check_libs= I think the relevant portion of config.log is: configure:23600: checking for "FOR_MSW" xpm configure:23612: gcc -o conftest -Wall -Wno-switch -Wundef -Wsign-compare -Wno-char-subscripts -Wpacked -Wshadow -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -g -I/usr/X11R6/include -L/usr/X11R6/lib conftest.c -lXpm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE -lm 1>&5 conftest.c:107: error: syntax error at end of input configure:23618: $? = 1 configure: failed program was: | /* confdefs.h. */ | | #define PACKAGE_NAME "XEmacs" | #define PACKAGE_TARNAME "xemacs" | #define PACKAGE_VERSION "21.5" | #define PACKAGE_STRING "XEmacs 21.5" | #define PACKAGE_BUGREPORT "xemacs-beta(a)xemacs.org" | #define EMACS_MAJOR_VERSION 21 | #define EMACS_MINOR_VERSION 5 | #define EMACS_BETA_VERSION 25 | #define XEMACS_CODENAME "eggplant" | #define XEMACS_EXTRA_NAME "(+CVS-20060328)" | #define XEMACS_RELEASE_DATE "2006-02-26" | #define EMACS_VERSION "21.5-b25" | #define EMACS_PROGNAME "xemacs" | #define ERROR_CHECK_EXTENTS 1 | #define ERROR_CHECK_TYPES 1 | #define ERROR_CHECK_TEXT 1 | #define ERROR_CHECK_GC 1 | #define ERROR_CHECK_MALLOC 1 | #define ERROR_CHECK_BYTE_CODE 1 | #define ERROR_CHECK_GLYPHS 1 | #define ERROR_CHECK_DISPLAY 1 | #define ERROR_CHECK_STRUCTURES 1 | #define DEBUG_XEMACS 1 | #define USE_ASSERTIONS 1 | #define MEMORY_USAGE_STATS 1 | #define config_machfile "m/intel386.h" | #define config_opsysfile "s/linux.h" | #define STACK_TRACE_EYE_CATCHER xemacs_21_5_b25_i686_pc_linux | #define CLASH_DETECTION 1 | #define _GNU_SOURCE 1 | #define _POSIX_C_SOURCE 199506L | #define _XOPEN_SOURCE 500 | #define _XOPEN_SOURCE_EXTENDED 1 | #define DOUG_LEA_MALLOC 1 | #define STDC_HEADERS 1 | #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_STAT_H 1 | #define HAVE_STDLIB_H 1 | #define HAVE_STRING_H 1 | #define HAVE_MEMORY_H 1 | #define HAVE_STRINGS_H 1 | #define HAVE_INTTYPES_H 1 | #define HAVE_STDINT_H 1 | #define HAVE_UNISTD_H 1 | #define HAVE_A_OUT_H 1 | #define HAVE_ELF_H 1 | #define HAVE_FCNTL_H 1 | #define HAVE_LIBGEN_H 1 | #define HAVE_LOCALE_H 1 | #define HAVE_WCHAR_H 1 | #define HAVE_SYS_PARAM_H 1 | #define HAVE_SYS_RESOURCE_H 1 | #define HAVE_SYS_TIME_H 1 | #define HAVE_SYS_TIMEB_H 1 | #define HAVE_SYS_TIMES_H 1 | #define HAVE_SYS_UN_H 1 | #define HAVE_SYS_VLIMIT_H 1 | #define HAVE_ULIMIT_H 1 | #define HAVE_SYS_WAIT_H 1 | #define STDC_HEADERS 1 | #define TIME_WITH_SYS_TIME 1 | #define HAVE_DECL_SYS_SIGLIST 1 | #define HAVE_UTIME 1 | #define RETSIGTYPE void | #define HAVE_TIMEVAL 1 | #define HAVE_STRUCT_TM_TM_ZONE 1 | #define HAVE_TM_ZONE 1 | #define SIZEOF_SHORT 2 | #define SIZEOF_INT 4 | #define SIZEOF_LONG 4 | #define SIZEOF_LONG_LONG 8 | #define SIZEOF_VOID_P 4 | #define SIZEOF_DOUBLE 8 | #define HAVE_LONG_FILE_NAMES 1 | #define HAVE_LIBM 1 | #define HAVE_INVERSE_HYPERBOLIC 1 | #define HAVE_MKSTEMP 1 | #define HAVE_LOCKF 1 | #define HAVE_FLOCK 1 | #define MAIL_LOCK_DOT 1 | #define HAVE_X_WINDOWS 1 | #define FUNCPROTO 15 | #define NARROWPROTO 1 | #define linux 1 | #define __i386__ 1 | #define _POSIX_SOURCE 1 | #define _BSD_SOURCE 1 | #define _SVID_SOURCE 1 | #define THIS_IS_X11R6 1 | #define HAVE_XCONVERTCASE 1 | #define HAVE_XTREGISTERDRAWABLE 1 | #define HAVE_X11_XLOCALE_H 1 | #define HAVE_X11_XFUNCPROTO_H 1 | #define HAVE_XREGISTERIMINSTANTIATECALLBACK 1 | #define XREGISTERIMINSTANTIATECALLBACK_NONSTANDARD_PROTOTYPE 1 | #define HAVE_XMU 1 | #define HAVE_BALLOON_HELP 1 | #define HAVE_WMCOMMAND 1 | #define HAVE_XAUTH 1 | #define HAVE_DLOPEN 1 | #define HAVE_SHLIB 1 | #define HAVE_DLERROR 1 | #define HAVE_XPM 1 | /* end confdefs.h. */ | XpmCreatePixmapFromData() configure:23643: result: yes I'm not much of a configure jockey, but it looks to me like that's a failed configure test and the result should be 'no'. Configuring --with-msw=no has no effect. Please let me know if any more information is needed. Thanks, Vin