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 83521d4154a253d361b610f74fb6eecec6b70ee3..1f4a1a5b3b92765d8b168fb0694a936562fe4fef 100755 (executable)
--- 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 028124057b05d1fb7c013b58c56449a34224a256..a2d7934cb292e009725e05b73fa41c272900d0e8 100755 (executable)
--- 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 (file)
index 0000000..f325468
--- /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 dbc9ea8536b97cc4d06a747a2a3778ef0ca361d4..4989ec3404479e8e1063111c2cd1195d67a26a73 100644 (file)
--- 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