Mercurial > hg > octave-nkf
diff configure.in @ 6051:583c98eeeae2
[project @ 2006-10-13 18:11:26 by jwe]
author | jwe |
---|---|
date | Fri, 13 Oct 2006 18:11:27 +0000 |
parents | 04c2ad6d1679 |
children | 1297bb9a3ad0 |
line wrap: on
line diff
--- a/configure.in +++ b/configure.in @@ -29,7 +29,7 @@ EXTERN_CXXFLAGS="$CXXFLAGS" AC_INIT -AC_REVISION($Revision: 1.525 $) +AC_REVISION($Revision: 1.526 $) AC_PREREQ(2.57) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -952,6 +952,7 @@ SHLLIB_VER='$(SHLLIB).$(version)' SHLBIN_VER='$(SHLBIN).$(version)' SHLLINKEXT= +LIBPRE=lib SH_LD='$(CXX)' SH_LDFLAGS=-shared DL_LD='$(SH_LD)' @@ -1008,6 +1009,17 @@ SONAME_FLAGS='-Wl,--out-implib=$@.a' library_path_var=PATH ;; + *-*-msdos) + DL_LDFLAGS="-shared -g" + CPICFLAG= + CXXPICFLAG= + FPICFLAG= + SHLEXT=dll + SHLLIB=lib + SHLBIN=dll + LIBPRE= + SH_LDFLAGS="-shared -g" + ;; *-*-linux* | *-*-gnu*) MKOCTFILE_DL_LDFLAGS="-shared -Wl,-Bsymbolic" SONAME_FLAGS='-Wl,-soname -Wl,$@' @@ -1097,6 +1109,7 @@ AC_MSG_NOTICE([defining SHLLIB_VER to be $SHLLIB_VER]) AC_MSG_NOTICE([defining SHLBIN_VER to be $SHLBIN_VER]) AC_MSG_NOTICE([defining SHLLINKEXT to be $SHLLINKEXT]) +AC_MSG_NOTICE([defining LIBPRE to be $LIBPRE]) AC_MSG_NOTICE([defining DLFCN_DIR to be $DLFCN_DIR]) AC_MSG_NOTICE([defining SH_LD to be $SH_LD]) AC_MSG_NOTICE([defining SH_LDFLAGS to be $SH_LDFLAGS]) @@ -1119,6 +1132,7 @@ AC_SUBST(SHLLIB_VER) AC_SUBST(SHLBIN_VER) AC_SUBST(SHLLINKEXT) +AC_SUBST(LIBPRE) AC_SUBST(DLFCN_DIR) AC_SUBST(SH_LD) AC_SUBST(SH_LDFLAGS) @@ -1765,6 +1779,15 @@ #define SIZEOF_OCTAVE_IDX_TYPE SIZEOF_INT #endif +#if defined (_MSC_VER) +/* missing parameters in macros */ +#pragma warning (disable: 4003) +/* missing implementations in template instantiation */ +#pragma warning (disable: 4996) +/* deprecated function names (FIXME?) */ +#pragma warning (disable: 4661) +#endif + #include "oct-types.h" ])