Mercurial > hg > octave-nkf

changeset 6089:9f9313969599

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2006-10-25 21:00:07 by jwe]
author jwe
date Wed, 25 Oct 2006 21:00:07 +0000
parents 32ea759ea27e
children ee50f74d1dd7
files ChangeLog configure.in
diffstat 2 files changed, 16 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* configure.in (INCLUDE_DEPS): Set and substitute.
 	(DEPEND_FLAGS, DEPEND_EXTRA_SED_PATTERN): Rearrange way these are set.
+
 	* Makeconf.in (INCLUDE_DEPS): Substitute here, and use to set default
 	value for omit_deps.
 
@@ -15,6 +16,10 @@
 	(AH_BOTTOM) [_MSC_VER]: include definitions for CRUFT_API,
 	OCTAVE_API, and OCTINTERP_API.
 
+	* configure.in (*-*-msdosmsvc): Add "-EHs -MD" to CXXFLAGS.
+	Add "-MD" to CFLAGS.  Add "-MD" to CONFLIB_ARG when checking for
+	libf2c.
+
 2006-10-25  John W. Eaton  <jwe@octave.org>
 
 	* mkoctfile.in (OCTAVE_VERSION): No need to quote replacement here.
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@
 EXTERN_CXXFLAGS="$CXXFLAGS"
 
 AC_INIT
-AC_REVISION($Revision: 1.529 $)
+AC_REVISION($Revision: 1.530 $)
 AC_PREREQ(2.57)
 AC_CONFIG_SRCDIR([src/octave.cc])
 AC_CONFIG_HEADER(config.h)
@@ -331,6 +331,10 @@
     OCTAVE_CXX_FLAG(-mminimal-toc, [
       XTRA_CXXFLAGS="$XTRA_CXXFLAGS -mminimal-toc"])
   ;;
+  *-*-msdosmsvc)
+    CXXFLAGS="$CXXFLAGS -EHs -MD"
+    CFLAGS="$CFLAGS -MD"
+  ;;
 esac
 
 AC_SUBST(XTRA_CFLAGS)
@@ -689,6 +693,11 @@
     CONFLIB_ARG="-L. -lconflib"
   fi
   rm -f conftest*
+  case "$canonical_host_type" in
+    *-*-msdosmsvc)
+      CONFLIB_ARG="-MD"
+      ;;
+  esac
   AC_CHECK_LIB(f2c, f_open, FLIBS=-lf2c, FLIBS=, $CONFLIB_ARG)
   rm -f $oct_conflib
 
@@ -1017,7 +1026,7 @@
     SONAME_FLAGS='-Wl,--out-implib=$@.a'
     library_path_var=PATH
   ;;
-  *-*-msdos)
+  *-*-msdosmsvc)
     DL_LDFLAGS="-shared -g"
     CPICFLAG=
     CXXPICFLAG=