Mercurial > octave-nkf
changeset 4105:92f4552ea359
[project @ 2002-10-16 14:55:38 by jwe]
| author | jwe |
|---|---|
| date | Wed, 16 Oct 2002 14:55:38 +0000 |
| parents | fef735180134 |
| children | 179066771796 |
| files | ChangeLog aclocal.m4 configure.in install-octave.in liboctave/ChangeLog liboctave/Makefile.in |
| diffstat | 6 files changed, 26 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Oct 15 20:28:21 2002 +0000 +++ b/ChangeLog Wed Oct 16 14:55:38 2002 +0000 @@ -1,3 +1,10 @@ +2002-10-16 Paul Kienzle <pkienzle@users.sf.net> + + * aclocal.m4: Both Cygwin and MinGW don't prepend underscores. + * configure.in: MinGW builds shared libraries the same as Cygwin. + MinGW must link to winsock explicitly. + * install-octave.in: MinGW and Cygwin both need OCTAVE_HOME. + 2002-10-15 Paul Kienzle <pkienzle@users.sf.net> * configure.in (library_path_var): New variable.
--- a/aclocal.m4 Tue Oct 15 20:28:21 2002 +0000 +++ b/aclocal.m4 Wed Oct 16 14:55:38 2002 +0000 @@ -601,12 +601,12 @@ cat conftest.$ac_ext >&AS_MESSAGE_LOG_FD fi AC_LANG_POP(C++) -### XXX FIXME XXX -- Ignore test result for cygwin. Yes it prepends -### underscore, but dlsym dnl seems to add it automatically. The +### XXX FIXME XXX -- Ignore test result on Windows. Yes it prepends +### underscore, but LoadLibrary ignores it automatically. The ### correct test is to build the shared library then try to grab the ### symbol from it with and without underscore. case "$canonical_host_type" in - *-*-cygwin*) + *-*-cygwin* | *-*-mingw*) octave_cv_cxx_prepends_underscore=no ;; esac
--- a/configure.in Tue Oct 15 20:28:21 2002 +0000 +++ b/configure.in Wed Oct 16 14:55:38 2002 +0000 @@ -22,7 +22,7 @@ ### 02111-1307, USA. AC_INIT -AC_REVISION($Revision: 1.378 $) +AC_REVISION($Revision: 1.379 $) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -658,7 +658,7 @@ *-*-darwin*) SH_LDFLAGS='-bundle -bundle_loader $(bindir)/octave' ;; - *-*-cygwin*) + *-*-cygwin* | *-*-mingw*) CXXPICFLAG= CPICFLAG= FPICFLAG= @@ -1132,6 +1132,13 @@ ### A system dependent kluge or two. +### Extra libs needed when using the win32api +case "$cannonical_host_type" in + *-*-mingw*) + LIBS="-lwsock32 $LIBS" + ;; +esac + AC_CHECK_FUNCS(getrusage times) case "$canonical_host_type" in *-*-cygwin*)
--- a/install-octave.in Tue Oct 15 20:28:21 2002 +0000 +++ b/install-octave.in Wed Oct 16 14:55:38 2002 +0000 @@ -307,7 +307,7 @@ fi case "$canonical_host_type" in - *-*-cygwin*) + *-*-cygwin* | *-*-mingw*) if $alt_dir; then echo "*** You have specified an installation directory different" echo "*** from the default. For Octave to run properly, you must"
--- a/liboctave/ChangeLog Tue Oct 15 20:28:21 2002 +0000 +++ b/liboctave/ChangeLog Wed Oct 16 14:55:38 2002 +0000 @@ -1,3 +1,7 @@ +2002-10-16 Paul Kienzle <pkienzle@users.sf.net> + + * Makefile.in (LIB_DEPS): Include $(LIBS). + 2002-10-14 John W. Eaton <jwe@bevo.che.wisc.edu> * lo-cieee.c: Move everything but lo_ieee_init here.
--- a/liboctave/Makefile.in Tue Oct 15 20:28:21 2002 +0000 +++ b/liboctave/Makefile.in Wed Oct 16 14:55:38 2002 +0000 @@ -18,12 +18,10 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -LIBOCTAVE_LFLAGS = -L../libcruft -L../kpathsea -L../glob -L. $(RLD_FLAG) - ifeq ($(INCLUDE_LINK_DEPS), true) LINK_DEPS = \ - $(LIBOCTAVE_LFLAGS) \ - $(LIBCRUFT) $(BLAS_LIBS) $(FFTW_LIBS) $(LIBREADLINE) -lglob + -L../libcruft -L../kpathsea -L../glob -L. $(RLD_FLAG) \ + $(LIBCRUFT) $(BLAS_LIBS) $(FFTW_LIBS) $(LIBREADLINE) -lglob $(LIBS) endif MATRIX_INC := Array.h Array2.h Array3.h ArrayN.h DiagArray2.h Array-flags.h \