Merge pull request #1024 from andyone/master

Fixed support for commas for all environment variables in configure script
This commit is contained in:
Mislav Marohnić 2017-11-29 15:20:00 +01:00 committed by GitHub
commit 66b9f6fb2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

24
src/configure vendored
View file

@ -34,16 +34,16 @@ esac
eval "$("$src_dir"/shobj-conf -C "$CC" -o "$host_os")" eval "$("$src_dir"/shobj-conf -C "$CC" -o "$host_os")"
sed " sed "
s,@CC@,${CC}, s#@CC@#${CC}#
s,@CFLAGS@,${CFLAGS//,/\\,}, s#@CFLAGS@#${CFLAGS}#
s,@LOCAL_CFLAGS@,${LOCAL_CFLAGS//,/\\,}, s#@LOCAL_CFLAGS@#${LOCAL_CFLAGS}#
s,@DEFS@,${DEFS}, s#@DEFS@#${DEFS}#
s,@LOCAL_DEFS@,${LOCAL_DEFS}, s#@LOCAL_DEFS@#${LOCAL_DEFS}#
s,@SHOBJ_CC@,${SHOBJ_CC}, s#@SHOBJ_CC@#${SHOBJ_CC}#
s,@SHOBJ_CFLAGS@,${SHOBJ_CFLAGS//,/\\,}, s#@SHOBJ_CFLAGS@#${SHOBJ_CFLAGS}#
s,@SHOBJ_LD@,${SHOBJ_LD}, s#@SHOBJ_LD@#${SHOBJ_LD}#
s,@SHOBJ_LDFLAGS@,${SHOBJ_LDFLAGS//,/\\,}, s#@SHOBJ_LDFLAGS@#${SHOBJ_LDFLAGS}#
s,@SHOBJ_XLDFLAGS@,${SHOBJ_XLDFLAGS//,/\\,}, s#@SHOBJ_XLDFLAGS@#${SHOBJ_XLDFLAGS}#
s,@SHOBJ_LIBS@,${SHOBJ_LIBS}, s#@SHOBJ_LIBS@#${SHOBJ_LIBS}#
s,@SHOBJ_STATUS@,${SHOBJ_STATUS}, s#@SHOBJ_STATUS@#${SHOBJ_STATUS}#
" "$src_dir"/Makefile.in > "$src_dir"/Makefile " "$src_dir"/Makefile.in > "$src_dir"/Makefile