[PATCH] Cygwin build
I submitted these a couple of weeks ago, but they didn't make it into the b22
release. I didn't receive any feedback, so I'm not sure if there was a problem
with the patches or what. Anyway, here are two of the three patches I sent
before. The third was superceded by a patch from Mike Alexander, which is
working fine.
The patches target two distinct problems with the Cygwin build of 21.5:
o 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.
o 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 file argument doesn't already end in '.exe'
--Rick
Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.11
diff -u -r1.11 configure.ac
--- configure.ac 2005/05/28 04:51:28 1.11
+++ configure.ac 2005/09/17 18:13:49
＠＠ -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 -r1.4 installexe.sh
--- lib-src/installexe.sh 2001/04/12 18:21:02 1.4
+++ lib-src/installexe.sh 2005/09/17 19:24:15
＠＠ -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 "