Mercurial > octave-nkf
changeset 9531:b859079d1644
configure and Makefile fixes for Windows
| author | Michael Goffioul <michael.goffioul@gmail.com> |
|---|---|
| date | Mon, 17 Aug 2009 12:19:33 -0400 |
| parents | f3df413338c5 |
| children | c4179ff88cf3 |
| files | ChangeLog aclocal.m4 src/ChangeLog src/Makefile.in |
| diffstat | 4 files changed, 33 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Aug 17 13:59:26 2009 +0200 +++ b/ChangeLog Mon Aug 17 12:19:33 2009 -0400 @@ -1,3 +1,8 @@ +2009-08-17 Michael Goffioul <michael.goffioul@gmail.com> + + * aclocal.m4 (OCTAVE_HDF5_DLL): Include HDF5_LIBS in LIBS before + attempting link. + 2009-08-15 Jaroslav Hajek <highegg@gmail.com> * aclocal.m4: Define the autoconf 2.64+ m4sugar macros `m4_ifblank'
--- a/aclocal.m4 Mon Aug 17 13:59:26 2009 +0200 +++ b/aclocal.m4 Mon Aug 17 12:19:33 2009 -0400 @@ -982,12 +982,15 @@ AC_CACHE_CHECK([if _HDF5USEDLL_ needs to be defined],octave_cv_hdf5_dll, [ AC_TRY_LINK([#include <hdf5.h>], [hid_t x = H5T_NATIVE_DOUBLE; return x], octave_cv_hdf5_dll=no, [ - CFLAGS_old=$CFLAGS + save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -DWIN32 -D_HDF5USEDLL_" + save_LIBS="$LIBS" + LIBS="$HDF5_LIBS $LIBS" AC_TRY_LINK([#include <hdf5.h>], [hid_t x = H5T_NATIVE_DOUBLE; return x], octave_cv_hdf5_dll=yes, octave_cv_hdf5_dll=no) - CFLAGS=$CFLAGS_old])]) + CFLAGS="$save_CFLAGS" + LIBS="$save_LIBS"])]) if test "$octave_cv_hdf5_dll" = yes; then AC_DEFINE(_HDF5USEDLL_, 1, [Define if using HDF5 dll (Win32)]) fi])
--- a/src/ChangeLog Mon Aug 17 13:59:26 2009 +0200 +++ b/src/ChangeLog Mon Aug 17 12:19:33 2009 -0400 @@ -1,3 +1,12 @@ +2009-08-17 Michael Goffioul <michael.goffioul@gmail.com> + + * Makefile.in (OCTINTERP_LINK_DEPS): Include $(LIBCRUFT) and + $(LIBS) in the list. + (OCT_LINK_DEPS): Include $(LIBOCTAVE) and $(LIBCRUFT) in the list. + (eigs.oct, qz.oct): Add $(BLAS_LIBS) to LDFLAGS. + (ccolamd.oct, symbfact.oct): Add library-specific CPPFLAGS and + LDFLAGS variables to CPPFLAGS and LDFLAGS. + 2009-08-17 Jaroslav Hajek <highegg@gmail.com> * ov-struct.h, ov-struct.cc: Revert to e08d72bb988e.
--- a/src/Makefile.in Mon Aug 17 13:59:26 2009 +0200 +++ b/src/Makefile.in Mon Aug 17 12:19:33 2009 -0400 @@ -294,9 +294,12 @@ endif OCTINTERP_LINK_DEPS = $(RLD_FLAG) -L../liboctave $(LIBOCTAVE) \ + -L../libcruft $(LIBCRUFT) $(LIBS) \ $(HDF5_LIBS) $(ZLIB_LIBS) $(X11_LIBS) $(OPENGL_LIBS) $(CARBON_LIBS) -OCT_LINK_DEPS = $(RLD_FLAG) -L. $(LIBOCTINTERP) +OCT_LINK_DEPS = $(RLD_FLAG) -L. $(LIBOCTINTERP) \ + -L../liboctave $(LIBOCTAVE) \ + -L../libcruft $(LIBCRUFT) BUILT_DISTFILES = DOCSTRINGS oct-gperf.h parse.cc lex.cc y.tab.h \ $(OPT_HANDLERS) $(BUILT_EXTRAS) @@ -658,7 +661,10 @@ __voronoi__.oct: OCT_LINK_DEPS += $(QHULL_LDFLAGS) $(QHULL_LIBS) eigs.d eigs.df eigs.o pic/eigs.o: CPPFLAGS += $(ARPACK_CPPFLAGS) -eigs.oct: OCT_LINK_DEPS += $(ARPACK_LDFLAGS) $(ARPACK_LIBS) +eigs.oct: OCT_LINK_DEPS += $(ARPACK_LDFLAGS) $(ARPACK_LIBS) $(BLAS_LIBS) + +qz.d qz.df qz.o pic/qz.o: +qz.oct: OCT_LINK_DEPS += $(BLAS_LIBS) qr.d qr.df qr.o pic/qr.o: CPPFLAGS += $(QRUPDATE_CPPFLAGS) qr.oct: OCT_LINK_DEPS += $(QRUPDATE_LDFLAGS) $(QRUPDATE_LIBS) @@ -686,6 +692,12 @@ colamd.d colamd.df pic/colamd.o colamd.o: CPPFLAGS += $(SPARSE_CPPFLAGS) colamd.oct: OCT_LINK_DEPS += $(SPARSE_LDFLAGS) $(SPARSE_LIBS) +ccolamd.d ccolamd.df pic/ccolamd.o ccolamd.o: CPPFLAGS += $(SPARSE_CPPFLAGS) +ccolamd.oct: OCT_LINK_DEPS += $(SPARSE_LDFLAGS) $(SPARSE_LIBS) + +symbfact.d symbfact.df pic/symbfact.o symbfact.o: CPPFLAGS += $(SPARSE_CPPFLAGS) +symbfact.oct: OCT_LINK_DEPS += $(SPARSE_LDFLAGS) $(SPARSE_LIBS) + dmperm.d dmperm.df pic/dmperm.o dmperm.o: CPPFLAGS += $(SPARSE_CPPFLAGS) dmperm.oct: OCT_LINK_DEPS += $(SPARSE_LDFLAGS) $(SPARSE_LIBS)