mirror of
git://git.sv.nongnu.org/freetype/freetype2.git
synced 2026-01-19 04:52:09 +00:00
[build] Don't use non-POSIX escapes in sed regexp.
* builds/unix/configure.raw (ftoption_set, ftoption_unset): Avoid `\>`. Fixes issue #1358.
This commit is contained in:
@@ -1112,21 +1112,26 @@ AC_SUBST([wl])
|
||||
AC_SUBST([build_libtool_libs])
|
||||
|
||||
|
||||
# changing LDFLAGS value should only be done after
|
||||
# lt_cv_prog_compiler_static_works test
|
||||
# We cannot use alternation (`\|`) in the `sed` regexp since it is not
|
||||
# portable.
|
||||
|
||||
ftoption_set()
|
||||
{
|
||||
regexp="-e \\\"s|.*#.*def.*$1\>.*|#define $1|\\\""
|
||||
regexp="-e \\\"s|.*#.*def.*$1 .*|#define $1|\\\" \
|
||||
-e \\\"s|.*#.*def.*$1\$|#define $1|\\\""
|
||||
FTOPTION_H_SED="$FTOPTION_H_SED $regexp"
|
||||
}
|
||||
|
||||
ftoption_unset()
|
||||
{
|
||||
regexp="-e \\\"s|.*#.*def.*$1\>.*|/* #undef $1 */|\\\""
|
||||
regexp="-e \\\"s|.*#.*def.*$1 .*|/* #undef $1 */|\\\" \
|
||||
-e \\\"s|.*#.*def.*$1\$|/* #undef $1 */|\\\""
|
||||
FTOPTION_H_SED="$FTOPTION_H_SED $regexp"
|
||||
}
|
||||
|
||||
# Changing the `LDFLAGS` value should only be done after the
|
||||
# `lt_cv_prog_compiler_static_works` test.
|
||||
|
||||
if test "$have_zlib" != no; then
|
||||
CFLAGS="$CFLAGS $ZLIB_CFLAGS"
|
||||
LDFLAGS="$LDFLAGS $ZLIB_LIBS"
|
||||
|
||||
Reference in New Issue
Block a user