Mercurial > octave
diff build-aux/subst-config-vals.in.sh @ 29554:99e3912441ec stable
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 | 0a5b15007766 |
| children | 0f57f0f47216 |
line wrap: on
line diff
--- a/build-aux/subst-config-vals.in.sh Tue Apr 20 16:20:10 2021 -0400 +++ b/build-aux/subst-config-vals.in.sh Sat Apr 24 19:17:16 2021 +0200 @@ -77,13 +77,23 @@ startupfiledir=`echo "@startupfiledir@" | sed "s|^${prefix}/\\+||"` texi_macros_file=`echo "@texi_macros_file@" | sed "s|^${prefix}/\\+||"` -## Replace portions of compiler flags that depend on prefix on target -cppflags=`echo "@CPPFLAGS@" | sed "s|@prefix@|\$\{prefix\}|g"` -fftw3f_ldflags=`echo "@FFTW3F_LDFLAGS@" | sed "s|@prefix@|\$\{prefix\}|g"` -fftw3_ldflags=`echo "@FFTW3_LDFLAGS@" | sed "s|@prefix@|\$\{prefix\}|g"` -flibs=`echo "@FLIBS@" | sed "s|@prefix@|\$\{prefix\}|g"` -ldflags=`echo "@LDFLAGS@" | sed "s|@prefix@|\$\{prefix\}|g"` -oct_link_opts=`echo "@OCT_LINK_OPTS@" | sed "s|@prefix@|\$\{prefix\}|g"` +if [ "x@OCTAVE_RELOCATE_ALL@" = "xyes" ]; then + ## Replace portions of compiler flags that depend on prefix on target + cppflags=`echo "@CPPFLAGS@" | sed "s|@prefix@|\$\{prefix\}|g"` + fftw3f_ldflags=`echo "@FFTW3F_LDFLAGS@" | sed "s|@prefix@|\$\{prefix\}|g"` + fftw3_ldflags=`echo "@FFTW3_LDFLAGS@" | sed "s|@prefix@|\$\{prefix\}|g"` + flibs=`echo "@FLIBS@" | sed "s|@prefix@|\$\{prefix\}|g"` + ldflags=`echo "@LDFLAGS@" | sed "s|@prefix@|\$\{prefix\}|g"` + oct_link_opts=`echo "@OCT_LINK_OPTS@" | sed "s|@prefix@|\$\{prefix\}|g"` +else + cppflags="@CPPFLAGS@" + fftw3f_ldflags="@FFTW3F_LDFLAGS@" + fftw3_ldflags="@FFTW3_LDFLAGS@" + flibs="@FLIBS@" + ldflags="@LDFLAGS@" + oct_link_opts="@OCT_LINK_OPTS@" +fi + srcdir="@srcdir@" top_srcdir="@top_srcdir@"