Mercurial > hg > octave-shane
changeset 9488:ee572cdd4b97
add configure checks for pthread library and compiler flags
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 05 Aug 2009 13:27:58 -0400 |
parents | 2894af292e69 |
children | fe8890c11b12 |
files | ChangeLog Makeconf.in configure.in liboctave/ChangeLog liboctave/Makefile.in |
diffstat | 5 files changed, 24 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-08-04 John W. Eaton <jwe@octave.org> + + * acx_pthread.m4: New file. + * configure.in: Include it and invoke ACX_PTHREAD macro. Print + ptrhead flags and libraries in summary output. + 2009-08-03 Jaroslav Hajek <highegg@gmail.com> * NEWS: Update.
--- a/Makeconf.in +++ b/Makeconf.in @@ -155,6 +155,9 @@ MAGICK_INCFLAGS = $(shell $(MAGICK_CONFIG) --cppflags) MAGICK_LIBS = $(shell $(MAGICK_CONFIG) --libs) +PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ +PTHREAD_LIBS = @PTHREAD_LIBS@ + LIBFLAGS = -L$(TOPDIR) DEFS = @DEFS@ @@ -167,7 +170,7 @@ CPICFLAG = @CPICFLAG@ XTRA_CFLAGS = @XTRA_CFLAGS@ WARN_CFLAGS = @WARN_CFLAGS@ -ALL_CFLAGS = $(INCFLAGS) $(DLL_CDEFS) $(DEFS) $(XTRA_CFLAGS) $(WARN_CFLAGS) $(CFLAGS) +ALL_CFLAGS = $(INCFLAGS) $(DLL_CDEFS) $(DEFS) $(XTRA_CFLAGS) $(WARN_CFLAGS) $(CFLAGS) $(PTHREAD_CFLAGS) BUG_CFLAGS = $(DEFS) $(XTRA_CFLAGS) $(WARN_CFLAGS) $(CFLAGS) BUILD_CC = @BUILD_CC@ @@ -190,7 +193,7 @@ XTRA_CXXFLAGS = @XTRA_CXXFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ ALL_CXXFLAGS = \ - $(INCFLAGS) $(DLL_CXXDEFS) $(DEFS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(CXXFLAGS) + $(INCFLAGS) $(DLL_CXXDEFS) $(DEFS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(CXXFLAGS) $(PTHREAD_CFLAGS) BUG_CXXFLAGS = $(DEFS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(CXXFLAGS) BUILD_CXX = @BUILD_CXX@
--- a/configure.in +++ b/configure.in @@ -254,6 +254,9 @@ AC_SUBST(DEPEND_FLAGS) AC_SUBST(DEPEND_EXTRA_SED_PATTERN) +sinclude(acx_pthread.m4) +ACX_PTHREAD + AC_PATH_X if test "$have_x"; then AC_DEFINE(HAVE_X_WINDOWS, 1, [Define if you have X11]) @@ -2225,6 +2228,8 @@ X11 include flags: $X11_INCFLAGS X11 libraries: $X11_LIBS CARBON libraries: $CARBON_LIBS + PTHREAD flags $PTHREAD_CFLAGS + PTHREAD libraries $PTHREAD_LIBS LIBS: $LIBS Default pager: $DEFAULT_PAGER gnuplot: $GNUPLOT
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,7 @@ +2009-08-05 John W. Eaton <jwe@octave.org> + + * Makefile.in (LINK_DEPS): Include $(PTHREAD_LIBS) in the list. + 2009-08-04 Kristian Rumberg <kristianrumberg@gmail.com> * cmd-edit.cc (gnu_readline::do_get_line_buffer,
--- a/liboctave/Makefile.in +++ b/liboctave/Makefile.in @@ -36,9 +36,10 @@ LINK_DEPS = \ -L../libcruft -L. $(RLD_FLAG) \ - $(LIBCRUFT) $(CHOLMOD_LIBS) $(UMFPACK_LIBS) $(AMD_LIBS) \ - $(CAMD_LIBS) $(COLAMD_LIBS) $(CCOLAMD_LIBS) $(CXSPARSE_LIBS) \ - $(ARPACK_LIBS) $(QRUPDATE_LIBS) $(BLAS_LIBS) $(FFTW_LIBS) $(LIBREADLINE) $(LIBGLOB) $(REGEX_LIBS) $(LIBS) $(FLIBS) + $(LIBCRUFT) $(CHOLMOD_LIBS) $(UMFPACK_LIBS) $(AMD_LIBS) $(CAMD_LIBS) \ + $(COLAMD_LIBS) $(CCOLAMD_LIBS) $(CXSPARSE_LIBS) $(ARPACK_LIBS) \ + $(QRUPDATE_LIBS) $(BLAS_LIBS) $(FFTW_LIBS) $(LIBREADLINE) $(LIBGLOB) \ + $(REGEX_LIBS) $(LIBS) $(FLIBS) $(PTHREAD_LIBS) MATRIX_INC := Array.h Array2.h Array3.h ArrayN.h DiagArray2.h \ Array-util.h MArray-decl.h MArray-defs.h \