Mercurial > octave-nkf

changeset 6091:96a11041f52b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2006-10-25 21:25:04 by jwe]
author jwe
date Wed, 25 Oct 2006 21:25:04 +0000
parents ee50f74d1dd7
children 30beea6739da
files ChangeLog configure.in
diffstat 2 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Oct 25 21:10:56 2006 +0000
+++ b/ChangeLog	Wed Oct 25 21:25:04 2006 +0000
@@ -24,6 +24,10 @@
 	* octMakefile.in (maintainer-clean, distclean): Also remove unistd.h.
 
 	* configure.in (*-*-msdosmsvc): Default sepchar is ';'.
+	Define default LIBS (link against kernel32 and ws2_32).
+	Force having LoadLibrary API.
+
+	* configure.in (AH_BOTTOM) [_MSC_VER]: Define __WIN32__.
 
 2006-10-25  John W. Eaton  <jwe@octave.org>
 
--- a/configure.in	Wed Oct 25 21:10:56 2006 +0000
+++ b/configure.in	Wed Oct 25 21:25:04 2006 +0000
@@ -29,7 +29,7 @@
 EXTERN_CXXFLAGS="$CXXFLAGS"
 
 AC_INIT
-AC_REVISION($Revision: 1.532 $)
+AC_REVISION($Revision: 1.533 $)
 AC_PREREQ(2.57)
 AC_CONFIG_SRCDIR([src/octave.cc])
 AC_CONFIG_HEADER(config.h)
@@ -1202,6 +1202,9 @@
    AC_CHECK_LIB(wsock32, gethostname)
    LIBS="$LIBS -lwsock32"
   ;;
+  *-*-msdosmsvc*)
+  LIBS="$LIBS -lws2_32 -lkernel32"
+  ;;
 esac
 
 ### Type stuff.
@@ -1380,7 +1383,7 @@
   ## autoconf test for LoadLibrary appears broken. Bypass for cygwin/mingw 
   if !($dlopen_api || $shl_load_api || $loadlibrary_api || $dyld_api); then
     case "$canonical_host_type" in
-      *-*-cygwin* | *-*-mingw*)
+      *-*-cygwin* | *-*-mingw* | *-*-msdosmsvc)
        loadlibrary_api=true;
       ;;
     esac
@@ -1824,6 +1827,7 @@
 #endif
 
 #if defined (_MSC_VER)
+#define __WIN32__
 /* missing parameters in macros */
 #pragma warning (disable: 4003)
 /* missing implementations in template instantiation */