Index: Makefile.am =================================================================== RCS file: /cvsroot/aspell/aspell/Makefile.am,v retrieving revision 1.60 diff -u -r1.60 Makefile.am --- Makefile.am 5 Feb 2005 21:59:12 -0000 1.60 +++ Makefile.am 16 Feb 2005 15:45:58 -0000 @@ -209,14 +209,7 @@ ### Add your filter sources here, ### starting with file containing filter class definition followed by ### file containing filter member implementation. -libaspell_la_SOURCES +=\ - modules/filter/email.cpp\ - modules/filter/tex.cpp\ - modules/filter/sgml.cpp\ - modules/filter/context.cpp\ - modules/filter/nroff.cpp\ - modules/filter/texinfo.cpp\ - modules/filter/genconv.cpp +libaspell_la_SOURCES += modules/filter/email.cpp modules/filter/tex.cpp modules/filter/sgml.cpp modules/filter/context.cpp modules/filter/nroff.cpp modules/filter/texinfo.cpp else # not COMPILE_IN_FILTERS Index: configure.ac =================================================================== RCS file: /cvsroot/aspell/aspell/configure.ac,v retrieving revision 1.69 diff -u -r1.69 configure.ac --- configure.ac 12 Feb 2005 22:23:54 -0000 1.69 +++ configure.ac 16 Feb 2005 15:45:58 -0000 @@ -147,6 +147,15 @@ AC_DEFINE(ENABLE_WIN32_RELOCATABLE, 1, [Defined if win32 relocation should be used]) fi + +case $host in + *-*-mingw32* | *-*-windows*) + AC_DEFINE(WIN32PORT, 1, [Defined if host platform is WIN32]) + OLDLDFLAGS=$LDFLAGS + LDFLAGS="$OLDLDFLAGS -Wl,--enable-runtime-pseudo-reloc" + ;; +esac + # DL stuff AC_CHECK_HEADERS(dlfcn.h) AC_CHECK_LIB(dl, dlopen) @@ -272,6 +281,9 @@ AC_MSG_RESULT([yes (in $PTHREAD_LIB)]) fi AC_DEFINE(USE_POSIX_MUTEX, 1, [Defined if Posix mutexes are supported]) +#else if [[ "$host" =~ "T*-*-mingw32*" || "$host" =~ "T*-*-windows*" ]] +#then +# AC_MSG_RESULT(no) else AC_MSG_RESULT(no) AC_MSG_WARN([Unable to find locking mechanism, Aspell will not be thread safe.]) Index: common/config.cpp =================================================================== RCS file: /cvsroot/aspell/aspell/common/config.cpp,v retrieving revision 1.75 diff -u -r1.75 config.cpp --- common/config.cpp 28 Dec 2004 03:42:23 -0000 1.75 +++ common/config.cpp 16 Feb 2005 15:45:58 -0000 @@ -9,12 +9,12 @@ #include #include #include +#include "settings.h" #ifdef WIN32PORT #include // GetModuleFilename #include // SHGetSpecialFolderLocation extern void * get_module_handle(); #endif -#include "settings.h" #include "dirs.h" #ifdef USE_LOCALE @@ -618,7 +618,7 @@ else if (strcmp(i, "prefix") == 0) { char * buff = new char [MAX_PATH]; - HMODULE hand = reinterpret_cast (get_module_handle()); + HMODULE hand = GetModuleHandle("libaspell.dll"); if (GetModuleFileName(hand, buff, MAX_PATH)) { //convert all \ chars to / for (char *ptr = buff; *ptr; ++ptr)