From: Ruediger Pluem <rpluem@apache.org>
Date: Wed, 4 Jan 2023 13:42:35 +0000 (+0000)
Subject: Use 'command -v' instead of 'which' which is more portable.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~170
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05297d7b00f0cb1f20d3ff14f4409097df2615fe;p=thirdparty%2Fapache%2Fhttpd.git

Use 'command -v' instead of 'which' which is more portable.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1906387 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/build/aix/buildaix.ksh b/build/aix/buildaix.ksh
index 83521d4154a..1f4a1a5b3b9 100755
--- a/build/aix/buildaix.ksh
+++ b/build/aix/buildaix.ksh
@@ -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
diff --git a/build/pkg/buildpkg.sh b/build/pkg/buildpkg.sh
index 028124057b0..a2d7934cb29 100755
--- a/build/pkg/buildpkg.sh
+++ b/build/pkg/buildpkg.sh
@@ -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
diff --git a/changes-entries/pr66130.txt b/changes-entries/pr66130.txt
new file mode 100644
index 00000000000..f3254688f43
--- /dev/null
+++ b/changes-entries/pr66130.txt
@@ -0,0 +1,2 @@
+  *) build: Use 'command -v' instead of 'which' which is more portable.
+     PR 66130 [Sam James <sam@gentoo.org>]
diff --git a/configure.in b/configure.in
index dbc9ea8536b..4989ec34044 100644
--- a/configure.in
+++ b/configure.in
@@ -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