From c837ac53923fcc00852a6f52c19e11766e278b7e Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Thu, 29 Aug 2024 21:50:13 +0200 Subject: [PATCH] Autotools: Use SED variable for sed command This syncs sed usages across the build system as SED variable is set to a suitable sed program on the system. --- build/php.m4 | 2 +- ext/odbc/config.m4 | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/php.m4 b/build/php.m4 index dd290c55fbf9..c270c1ec3e2e 100644 --- a/build/php.m4 +++ b/build/php.m4 @@ -2102,7 +2102,7 @@ EOF if test -n "$val"; then echo "$var='$val' \\" >> $1 if test `expr "X$ac_configure_args" : ".*${var}.*"` != 0; then - clean_configure_args=$(echo $clean_configure_args | sed -e "s#'$var=$val'##") + clean_configure_args=$(echo $clean_configure_args | $SED -e "s#'$var=$val'##") fi fi done diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4 index 40e4995e4b21..02dfc47f6ced 100644 --- a/ext/odbc/config.m4 +++ b/ext/odbc/config.m4 @@ -70,7 +70,7 @@ else ODBC_LIBS=-l${ac_solid_prefix}${ac_solid_os}${ac_solid_version} fi - AC_MSG_RESULT([$(echo $ODBC_LIBS | sed -e 's!.*/!!')]) + AC_MSG_RESULT([$(echo $ODBC_LIBS | $SED -e 's!.*/!!')]) ]) dnl @@ -84,7 +84,7 @@ AC_DEFUN([PHP_ODBC_FIND_EMPRESS_LIBS],[ if test ! -f $ODBC_LIBS; then ODBC_LIBS=$(echo $1/libempodbccl.so | cut -d' ' -f1) fi - AC_MSG_RESULT([$(echo $ODBC_LIBS | sed -e 's!.*/!!')]) + AC_MSG_RESULT([$(echo $ODBC_LIBS | $SED -e 's!.*/!!')]) ]) dnl @@ -99,7 +99,7 @@ AC_DEFUN([PHP_ODBC_FIND_EMPRESS_BCS_LIBS],[ if test ! -f $ODBCBCS_LIBS; then ODBCBCS_LIBS=$(echo $1/libempodbcbcs.a | cut -d' ' -f1) fi - AC_MSG_RESULT([$(echo $ODBCBCS_LIBS | sed -e 's!.*/!!')]) + AC_MSG_RESULT([$(echo $ODBCBCS_LIBS | $SED -e 's!.*/!!')]) ]) dnl @@ -410,7 +410,7 @@ PHP_ARG_WITH([dbmaker],, DBMAKER_VERSION=5.0 while test ! -d $DBMAKER_HOME/$DBMAKER_VERSION && test "$DBMAKER_VERSION" != "2.9"; do - DM_VER=$(echo $DBMAKER_VERSION | sed -e 's/\.//' | $AWK '{ print $1-1;}') + DM_VER=$(echo $DBMAKER_VERSION | $SED -e 's/\.//' | $AWK '{ print $1-1;}') MAJOR_V=$(echo $DM_VER | $AWK '{ print $1/10; }' | $AWK -F. '{ print $1; }') MINOR_V=$(echo $DM_VER | $AWK '{ print $1%10; }') DBMAKER_VERSION=$MAJOR_V.$MINOR_V