Mercurial > octave

comparison configure.ac @ 29554:99e3912441ec stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Make relocation of dependencies with Octave optional (bug #60413). * configure.ac: Add new option "--enable-relocate-all". * build-aux/subst-config-vals.in.sh, build-aux/subst-cross-config-vals.in.sh: Replace parts of flags that match the prefix only optionally. * src/mkoctfile.in.cc (replace_prefix): Only replace arts of flags that match the prefix only if configured to do so.
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 24 Apr 2021 19:17:16 +0200
parents f4cf798e6d8f
children 0f57f0f47216 fc282fdd1a42
comparison
equal deleted inserted replaced
29545:841ca9987302 29554:99e3912441ec
2633 fi 2633 fi
2634 AM_CONDITIONAL([AMCOND_BUILD_DOCS], [test $ENABLE_DOCS = yes]) 2634 AM_CONDITIONAL([AMCOND_BUILD_DOCS], [test $ENABLE_DOCS = yes])
2635 2635
2636 AM_CONDITIONAL([AMCOND_BUILD_QT_DOCS], 2636 AM_CONDITIONAL([AMCOND_BUILD_QT_DOCS],
2637 [test $ENABLE_DOCS = yes && test $build_qt_gui = yes]) 2637 [test $ENABLE_DOCS = yes && test $build_qt_gui = yes])
2638
2639 OCTAVE_RELOCATE_ALL=no
2640 AC_ARG_ENABLE([relocate-all],
2641 [AS_HELP_STRING([--enable-relocate-all],
2642 [assume that all dependencies that are installed under the same prefix are relocated when Octave is relocated])],
2643 [if test "$enableval" = yes; then OCTAVE_RELOCATE_ALL=yes; fi], [])
2644 AC_SUBST(OCTAVE_RELOCATE_ALL)
2645 if test $OCTAVE_RELOCATE_ALL = yes; then
2646 AC_DEFINE(OCTAVE_REPLACE_PREFIX, 1, [Replace prefix in mkoctfile flags.])
2647 fi
2638 2648
2639 ### Determine whether Mercurial ID should be embedded in library binaries. 2649 ### Determine whether Mercurial ID should be embedded in library binaries.
2640 2650
2641 ENABLE_HG_ID=yes 2651 ENABLE_HG_ID=yes
2642 AC_ARG_ENABLE([hg-id], 2652 AC_ARG_ENABLE([hg-id],