Mingw32 gcc 2.95 does not have the symbol WINDOWSNT defined, so the wrong lines get selected for Mingw32. This patch replaces WINDOWSNT with a symbol that is defined in the gcc 2.95 specs file (_WIN32). This will now select the lines that don't create the link between xemacs and xemacs-21.2-b19.exe. 1999-09-18 Craig Lanning <lanning(a)scra.org&gt; * Makefile.in.in: Changed ifdef WINDOWSNT to ifdef _WIN32. Index: Makefile.in.in =================================================================== RCS file: /usr/CVSroot/XEmacs/xemacs/Attic/Makefile.in.in,v retrieving revision 1.1.2.12 diff -u -r1.1.2.12 Makefile.in.in --- Makefile.in.in 1999/08/31 21:27:42 1.1.2.12 +++ Makefile.in.in 1999/09/18 20:42:30 ＠＠ -412,7 +412,7 ＠＠ for subdir in `find ${archlibdir} -type d ! -name RCS ! -name SCCS !

do (cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ; done ; \ else true; fi -#ifdef WINDOWSNT +#ifdef _WIN32 ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME} -chmod 0755 ${bindir}/${PROGNAME} #else

Please, Andy, test this untested patch, and if found to be satisfactory, commit it to CVS yourself.

This should do it I think. andy 1999-09-20 Andy Piper <andy(a)xemacs.org&gt; * Makefile.in.in: use __CYGWIN32__ and __MINGW32__ to predicate installation linkage. Index: Makefile.in.in =================================================================== RCS file: /usr/CVSroot/XEmacs/xemacs/Attic/Makefile.in.in,v retrieving revision 1.1.2.12 diff -u -r1.1.2.12 Makefile.in.in --- Makefile.in.in 1999/08/31 21:27:42 1.1.2.12 +++ Makefile.in.in 1999/09/20 15:50:30 ＠＠ -412,14 +412,18 ＠＠ for subdir in `find ${archlibdir} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; \ do (cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ; done ; \ else true; fi -#ifdef WINDOWSNT +#ifdef __MINGW32__ ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME} -chmod 0755 ${bindir}/${PROGNAME} #else ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version} -chmod 0755 ${bindir}/${PROGNAME}-${version} +# ifdef __CYGWIN32__ + cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME} +# else cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME} -#endif +# endif /* __CYGWIN32__ */ +#endif /* __MINGW32__ */ if test "${prefix}" != "${exec_prefix}"; then \ for dir in \ lib/${inststaticdir} \ -------------------------------------------------------------- Dr Andy Piper Senior Consultant Architect, BEA Systems Ltd

Craig Lanning writes: > I thought about using __MINGW32__, but I was trying not to restrict > the fix to just mingw32. Apparently, I ended up being too general. > This looks like an acceptable alternative. It's not as acceptable as I thought. I updated from cvs yesterday (I was out of the office last week) and rebuilt xemacs. It still created the link. After a little investigation, I realized that the makefile is being constructed by using 'gcc -E'. This means that __CYGWIN32__ is defined, not __MINGW32__. It needs to be using 'gcc -mno-cygwin -E' instead of 'gcc -E'.

Craig Lanning wrote: > Craig Lanning writes: > > I thought about using __MINGW32__, but I was trying not to restrict > > the fix to just mingw32. Apparently, I ended up being too general. > > This looks like an acceptable alternative. > > It's not as acceptable as I thought. I updated from cvs yesterday (I > was out of the office last week) and rebuilt xemacs. It still created > the link. After a little investigation, I realized that the makefile > is being constructed by using 'gcc -E'. This means that __CYGWIN32__ > is defined, not __MINGW32__. It needs to be using 'gcc -mno-cygwin > -E' instead of 'gcc -E'. To build a non-Cygwin version with Cygwin's gcc, I suspect that you will need to use something like: ./configure --target=i386-pc-mingw32 ... or CC='gcc -mno-cygwin' ./configure ... or CC='gcc -b i386-pc-mingw32' ./configure ... I haven't checked if the above work with Cygwin, but (IMHO) they probably should. I can't see any way that configure can automatiacally deduce that you wish to perform a cross-compilation (which is basically what building for an i386-pc-mingw32 target on an i386-pc-cygwin32 platform amounts to). -- Glynn Clements <glynn(a)sensei.co.uk&gt;