summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Smith <brian@dbsoft.org>2023-11-08 19:20:13 -0600
committerBrian Smith <brian@dbsoft.org>2023-11-08 19:20:13 -0600
commit007b998b23e424420b4019ff4546dcaa1d95cac9 (patch)
tree69eab05a227c9784fcba34b24be40bf5b8216913
parent2637007c7835748367132c4e90b14831519454d0 (diff)
downloaduxp-007b998b23e424420b4019ff4546dcaa1d95cac9.tar.gz
Issue #2376 - Split NSPR sed into BSD and GNU.
Mac and the BSDs use [^[:space:]]. Use GNU sed on other platforms with \S.
-rw-r--r--old-configure.in9
1 files changed, 8 insertions, 1 deletions
diff --git a/old-configure.in b/old-configure.in
index 41f0941164..711bf1db4d 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -5252,7 +5252,14 @@ ac_configure_args="$_SUBDIR_CONFIG_ARGS"
# --with-system-nspr will have been converted into the relevant $NSPR_CFLAGS
# and $NSPR_LIBS.
-ac_configure_args="`echo $ac_configure_args | sed -e 's/--with-system-nspr[^[:space:]]* *//'`"
+case "${OS_TARGET}" in
+ Darwin|DragonFly|FreeBSD|NetBSD|OpenBSD)
+ ac_configure_args="`echo $ac_configure_args | sed -e 's/--with-system-nspr[^[:space:]]* *//'`"
+ ;;
+ *)
+ ac_configure_args="`echo $ac_configure_args | ${TOOLCHAIN_PREFIX}sed -e 's/--with-system-nspr\S* *//'`"
+ ;;
+esac
if test -n "$NSPR_CFLAGS" -o -n "$NSPR_LIBS"; then
ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'"