Mercurial > octave
diff build-aux/subst-config-vals.in.sh @ 29321:78c660a8ba84
build: Support double quoted paths in configure variables (bug #59923).
* build-aux/subst-config-vals.in.h, build-aux/subst-cross-config-vals.in.h:
Use single quotes to allow for double quoted paths in configure variables.
Replace double quotes by double escaped double quotes.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Sun, 24 Jan 2021 13:03:06 +0100 |
| parents | d7169f012ee1 |
| children | 7854d5752dd2 |
line wrap: on
line diff
--- a/build-aux/subst-config-vals.in.sh Sun Jan 24 15:42:27 2021 -0800 +++ b/build-aux/subst-config-vals.in.sh Sun Jan 24 13:03:06 2021 +0100 @@ -78,12 +78,15 @@ 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"` +## FIXME: Some of these flags might contain double quotes. +## Is it ok to use single quotes here? +cppflags=`echo '@CPPFLAGS@' | sed "s|@prefix@|\$\{prefix\}|g" | sed 's|\"|\\\\\\\"|g'` +fftw3f_ldflags=`echo '@FFTW3F_LDFLAGS@' | sed "s|@prefix@|\$\{prefix\}|g" | sed 's|\"|\\\\\\\"|g'` +fftw3_ldflags=`echo '@FFTW3_LDFLAGS@' | sed "s|@prefix@|\$\{prefix\}|g" | sed 's|\"|\\\\\\\"|g'` +flibs=`echo '@FLIBS@' | sed "s|@prefix@|\$\{prefix\}|g" | sed 's|\"|\\\\\\\"|g'` +ldflags=`echo '@LDFLAGS@' | sed "s|@prefix@|\$\{prefix\}|g" | sed 's|\"|\\\\\\\"|g'` +oct_link_opts=`echo '@OCT_LINK_OPTS@' | sed "s|@prefix@|\$\{prefix\}|g" | sed 's|\"|\\\\\\\"|g'` + srcdir="@srcdir@" top_srcdir="@top_srcdir@"