At 10:54 PM 6/3/00 -0400, Craig Lanning wrote:
All,
Below is a patch which improves the accuracy of the Installation file that
is produced by configure for the mingw32 port.
Also included is something to "do the right thing" (I think) WRT module
support in the mingw32 port. This was prompted by the message from Andrew
Begel <abegel(a)cs.berkeley.edu>. I'm not sure if this makes things more
workable for modules or not since I still haven't figured out how to make
DLL's with gcc -mno-cygwin.
Craig
Sorry, I forgot to include the ChangLog entries :-(
Craig
2000-06-03 Craig Lanning <CraigL(a)DyCon.com>
* configure.in:
Clean up mingw32 parts so that the Installation file gives a more
correct description of what was built into the image.
(Checking for MS-Windows): added with_pop=yes and
with_native_sound=yes
(Checking for module support): added tests for mingw32 to make it
do the right thing
2000-06-03 Craig Lanning <CraigL(a)DyCon.com>
* s/mingw32.h: Removed the #define's for HAVE_NATIVE_SOUND and
MAIL_USE_POP since they are now handled by configure.
Index: configure.in
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/configure.in,v
retrieving revision 1.111.2.106
diff -u -r1.111.2.106 configure.in
--- configure.in 2000/06/01 07:41:44 1.111.2.106
+++ configure.in 2000/06/04 02:49:46
@@ -2737,6 +2737,8 @@
int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }],
[AC_DEFINE(HAVE_MSG_SELECT)])
with_file_coding=yes
+ with_pop=yes
+ with_native_sound=yes
XE_ADD_OBJS(console-msw.o device-msw.o event-msw.o frame-msw.o
objects-msw.o select-msw.o redisplay-msw.o glyphs-msw.o gui-msw.o)
fi
fi
@@ -4068,19 +4070,26 @@
if test "$with_modules" != "no"; then
AC_CHECKING(for module support)
- dnl Find headers and libraries
- AC_CHECK_HEADER(dlfcn.h, [
- AC_CHECK_LIB(dl, dlopen, [ have_dl=yes libdl=dl], [
- AC_CHECK_LIB(c, dlopen, [ have_dl=yes ])])])
- if test -n "$have_dl"; then
- AC_DEFINE(HAVE_DLOPEN)
+ AC_MSG_CHECKING(for mingw32)
+ if test "$opsys" = "mingw32"; then
+ AC_MSG_RESULT(yes)
+ have_dl=yes
else
- AC_CHECK_LIB(dld, shl_load, [
- libdl=dld have_dl=yes;
- AC_DEFINE(HAVE_SHL_LOAD)], [
- AC_CHECK_LIB(dld, dld_init, [
- libdl=dld have_dl=yes;
- AC_DEFINE(HAVE_DLD_INIT)])])
+ AC_MSG_RESULT(no)
+ dnl Find headers and libraries
+ AC_CHECK_HEADER(dlfcn.h, [
+ AC_CHECK_LIB(dl, dlopen, [ have_dl=yes libdl=dl], [
+ AC_CHECK_LIB(c, dlopen, [ have_dl=yes ])])])
+ if test -n "$have_dl"; then
+ AC_DEFINE(HAVE_DLOPEN)
+ else
+ AC_CHECK_LIB(dld, shl_load, [
+ libdl=dld have_dl=yes;
+ AC_DEFINE(HAVE_SHL_LOAD)], [
+ AC_CHECK_LIB(dld, dld_init, [
+ libdl=dld have_dl=yes;
+ AC_DEFINE(HAVE_DLD_INIT)])])
+ fi
fi
if test -n "$have_dl"; then
Index: src/s/mingw32.h
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/src/s/Attic/mingw32.h,v
retrieving revision 1.1.2.9
diff -u -r1.1.2.9 mingw32.h
--- mingw32.h 2000/05/22 09:52:59 1.1.2.9
+++ mingw32.h 2000/06/04 02:49:47
@@ -62,10 +62,8 @@
#define HAVE_SOCKETS
/* #endif */
#define OBJECTS_SYSTEM ntplay.o nt.o ntheap.o ntproc.o dired-msw.o
-#define HAVE_NATIVE_SOUND
#undef MAIL_USE_SYSTEM_LOCK
-#define MAIL_USE_POP
#define HAVE_MSW_C_DIRED
/* Define NO_ARG_ARRAY if you cannot take the address of the first of a