Mercurial > octave
comparison configure.ac @ 26363:16607f64eea1 stable
Include -loctave -loctinterp and lib path to mkoctfile link command (bug #55033).
* configure.ac: Set MKOCTFILE_OCT_LINK_DEPS to LIBOCTINTERP and LIBOCTAVE when
configured with --enable-link-all-dependencies.
* src/mkoctfile.in.cc (main): Include -L$OCTLIBDIR in DEFAULT_LFLAGS when
compiling for Mac.
author | Ben Abbott <bpabbott@mac.com> |
---|---|
date | Wed, 02 Jan 2019 14:30:11 +0800 |
parents | a88cf545cfca |
children | 00f796120a6d f1a8a4aac3d4 |
comparison
equal
deleted
inserted
replaced
26362:e3dfcfc8bd6c | 26363:16607f64eea1 |
---|---|
2757 if test $link_all_deps = yes; then | 2757 if test $link_all_deps = yes; then |
2758 OCT_LINK_DEPS="libinterp/liboctinterp.la liboctave/liboctave.la" | 2758 OCT_LINK_DEPS="libinterp/liboctinterp.la liboctave/liboctave.la" |
2759 OCT_GUI_LINK_DEPS="libgui/liboctgui.la libinterp/liboctinterp.la liboctave/liboctave.la" | 2759 OCT_GUI_LINK_DEPS="libgui/liboctgui.la libinterp/liboctinterp.la liboctave/liboctave.la" |
2760 | 2760 |
2761 MKOCTFILE_OCTAVE_LINK_DEPS="$LIBOCTINTERP_LINK_DEPS $MKOCTFILE_LIBOCTAVE_LINK_DEPS" | 2761 MKOCTFILE_OCTAVE_LINK_DEPS="$LIBOCTINTERP_LINK_DEPS $MKOCTFILE_LIBOCTAVE_LINK_DEPS" |
2762 MKOCTFILE_OCT_LINK_DEPS="$OCT_LINK_DEPS $MKOCTFILE_LIBOCTINTERP_LINK_DEPS" | 2762 MKOCTFILE_OCT_LINK_DEPS="$LIBOCTINTERP $LIBOCTAVE" |
2763 | 2763 |
2764 LIBOCTINTERP_LINK_DEPS="$LIBOCTINTERP_LINK_DEPS $LIBOCTAVE_LINK_DEPS" | 2764 LIBOCTINTERP_LINK_DEPS="$LIBOCTINTERP_LINK_DEPS $LIBOCTAVE_LINK_DEPS" |
2765 LIBOCTINTERP_LINK_OPTS="$LIBOCTINTERP_LINK_OPTS $LIBOCTAVE_LINK_OPTS" | 2765 LIBOCTINTERP_LINK_OPTS="$LIBOCTINTERP_LINK_OPTS $LIBOCTAVE_LINK_OPTS" |
2766 | 2766 |
2767 OCTAVE_LINK_DEPS="$LIBOCTINTERP_LINK_DEPS" | 2767 OCTAVE_LINK_DEPS="$LIBOCTINTERP_LINK_DEPS" |