Patches for Cygwin build

The patches below target three distinct problems with the Cygwin build of 21.5: 1. When building without X, make would exit with a syntax error when including XPM in one of the files in src. I don't recall which file. configure was properly determining the location of the non-X version of the XPM header and library files, but was not propagating the include directive to XE_CFLAGS. The change to configure.ac just adds the correct include directive to XE_CFLAGS. 2. When linking, the linker would complain about an unresolved external mswindows_current_locale when building without MULE. Someone with some knowledge of MULE should look at what I did in event-msw.c. It's very simple and it seems to work so far, but I may just be getting lucky. 3. When installing, lib-src/installexe.sh would add an extra .exe suffix to the end of the executable file name. The result was, in the most recent build, xemacs-21.5-b21.exe.exe. The change to installexe.sh just checks to make sure that the target argument doesn't already end in '.exe' The diffs are against the current CVS code. I've built with and without MULE and X in all combinations and everything appears to be working (so far). --Rick ChangeLog: 2005-08-06 Rick Rankin <rrankin1424 hyphen xemacs at yahoo dot com> * configure.ac: Make sure that the correct include directories are added to XE_CFLAGS for building with XPM and without X * lib-src/installexe.sh: Prevent an extra '.exe' suffix from being added if the target name already has a '.exe' suffix * src/event-msw.c (mswindows_wnd_proc): Make sure that mswindows_current_local doesn't get called if MULE isn't defined. Diffs: Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.11 diff -u --unified -r1.11 configure.ac --- configure.ac 2005/05/28 04:51:28 1.11 +++ configure.ac 2005/09/07 05:25:08 ＠＠ -3755,6 +3755,7 ＠＠ xpm_problem="" if test -z "$with_xpm"; then XE_PREPEND("$incpath_xpm", CFLAGS) + XE_PREPEND("$incpath_xpm", XE_CFLAGS) XE_PREPEND("$libpath_xpm", LDFLAGS) AC_MSG_CHECKING(for Xpm - no older than 3.4f) xe_check_libs=-lXpm ＠＠ -3794,6 +3795,7 ＠＠ XE_PREPEND("$libpath_xpm", LDFLAGS) XE_PREPEND(-lXpm, libs_x) XE_PREPEND("$incpath_xpm", CFLAGS) + XE_PREPEND("$incpath_xpm", XE_CFLAGS) AC_MSG_CHECKING(for \"FOR_MSW\" xpm) xe_check_libs=-lXpm AC_TRY_LINK(, [XpmCreatePixmapFromData()], Index: lib-src/installexe.sh =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/installexe.sh,v retrieving revision 1.4 diff -u --unified -r1.4 installexe.sh --- lib-src/installexe.sh 2001/04/12 18:21:02 1.4 +++ lib-src/installexe.sh 2005/09/07 05:25:08 ＠＠ -5,11 +5,16 ＠＠ tstr="" -while [ $# -gt 0 ] +while [[ $# -gt 0 ]] do - if [ -f $1.exe ] + if [[ -f $1.exe ]] then - tstr="$tstr$1.exe $2.exe" + if [[ "$2" == *.exe ]] + then + tstr="$tstr$1 $2" + else + tstr="$tstr$1.exe $2.exe" + fi shift 2 else tstr="$tstr$1 " Index: src/event-msw.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/event-msw.c,v retrieving revision 1.104 diff -u --unified -r1.104 event-msw.c --- src/event-msw.c 2005/06/26 18:05:04 1.104 +++ src/event-msw.c 2005/09/07 05:25:09 ＠＠ -2803,7 +2803,11 ＠＠ case KEYCHAR_UNDERLYING_VIRTUAL_KEY_CURRENT_LANGENV: vk_only = 1; case KEYCHAR_CURRENT_LANGENV: +#ifdef MULE lcid = mswindows_current_locale (); +#else + lcid = GetSystemDefaultLCID (); +#endif break; case KEYCHAR_UNDERLYING_VIRTUAL_KEY_DEFAULT_USER: