You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rp...@apache.org on 2023/01/04 13:42:35 UTC
svn commit: r1906387 - in /httpd/httpd/trunk: build/aix/buildaix.ksh build/pkg/buildpkg.sh changes-entries/pr66130.txt configure.in
Author: rpluem
Date: Wed Jan 4 13:42:35 2023
New Revision: 1906387
URL: http://svn.apache.org/viewvc?rev=1906387&view=rev
Log:
Use 'command -v' instead of 'which' which is more portable.
Added:
httpd/httpd/trunk/changes-entries/pr66130.txt (with props)
Modified:
httpd/httpd/trunk/build/aix/buildaix.ksh
httpd/httpd/trunk/build/pkg/buildpkg.sh
httpd/httpd/trunk/configure.in
Modified: httpd/httpd/trunk/build/aix/buildaix.ksh
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/aix/buildaix.ksh?rev=1906387&r1=1906386&r2=1906387&view=diff
==============================================================================
--- httpd/httpd/trunk/build/aix/buildaix.ksh (original)
+++ httpd/httpd/trunk/build/aix/buildaix.ksh Wed Jan 4 13:42:35 2023
@@ -26,14 +26,14 @@ export CFLAGS='-O2 -qlanglvl=extc99'
lslpp -L bos.adt.insttools >/dev/null
[[ $? -ne 0 ]] && echo "must have bos.adt.insttools installed" && exit -1
-apr_config=`which apr-1-config`
-apu_config=`which apu-1-config`
+apr_config=`command -v apr-1-config`
+apu_config=`command -v apu-1-config`
if [[ -z ${apr_config} && -z ${apu_config} ]]
then
export PATH=/opt/bin:${PATH}
- apr_config=`which apr-1-config`
- apu_config=`which apu-1-config`
+ apr_config=`command -v apr-1-config`
+ apu_config=`command -v apu-1-config`
fi
while test $# -gt 0
Modified: httpd/httpd/trunk/build/pkg/buildpkg.sh
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/pkg/buildpkg.sh?rev=1906387&r1=1906386&r2=1906387&view=diff
==============================================================================
--- httpd/httpd/trunk/build/pkg/buildpkg.sh (original)
+++ httpd/httpd/trunk/build/pkg/buildpkg.sh Wed Jan 4 13:42:35 2023
@@ -24,8 +24,8 @@ PREFIX=/usr/local/apache2
TEMPDIR=/var/tmp/$USER/httpd-root
rm -rf $TEMPDIR
-apr_config=`which apr-1-config`
-apu_config=`which apu-1-config`
+apr_config=`command -v apr-1-config`
+apu_config=`command -v apu-1-config`
while test $# -gt 0
do
Added: httpd/httpd/trunk/changes-entries/pr66130.txt
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/changes-entries/pr66130.txt?rev=1906387&view=auto
==============================================================================
--- httpd/httpd/trunk/changes-entries/pr66130.txt (added)
+++ httpd/httpd/trunk/changes-entries/pr66130.txt Wed Jan 4 13:42:35 2023
@@ -0,0 +1,2 @@
+ *) build: Use 'command -v' instead of 'which' which is more portable.
+ PR 66130 [Sam James <sa...@gentoo.org>]
Propchange: httpd/httpd/trunk/changes-entries/pr66130.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: httpd/httpd/trunk/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/configure.in?rev=1906387&r1=1906386&r2=1906387&view=diff
==============================================================================
--- httpd/httpd/trunk/configure.in (original)
+++ httpd/httpd/trunk/configure.in Wed Jan 4 13:42:35 2023
@@ -224,13 +224,13 @@ AC_ARG_WITH(pcre,
APACHE_HELP_STRING(--with-pcre=PATH,Use external PCRE library))
if test "x$with_pcre" = "x" || test "$with_pcre" = "yes"; then
with_pcre="$PATH"
-else if which $with_pcre 2>/dev/null; then :; else
+else if command -v $with_pcre 2>/dev/null; then :; else
with_pcre="$with_pcre/bin:$with_pcre"
fi
fi
AC_CHECK_TARGET_TOOLS(PCRE_CONFIG, [pcre2-config pcre-config],
- [`which $with_pcre 2>/dev/null`], $with_pcre)
+ [`command -v $with_pcre 2>/dev/null`], $with_pcre)
if test "x$PCRE_CONFIG" != "x"; then
if $PCRE_CONFIG --version >/dev/null 2>&1; then :; else