diff --git a/autogen.sh b/autogen.sh
index ab7dc4446..2ae55eb70 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -15,7 +15,7 @@
 # Required binaries check
 #          
 check_bin_file(){
-   which $1 > /dev/null 2>&1
+   command -v $1 > /dev/null 2>&1
    if [ $? = 0 ]; then
       return 0
    else
diff --git a/configure.ac b/configure.ac
index fef3bfc94..5c308cb72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -297,18 +297,18 @@ if test "x$enable_png" = "xyes"; then
 
 dnl Check if the user hasn't set the variable $PNG_CONFIG
   if test -z "$PNG_CONFIG"; then
-    PNG_CONFIG=`which libpng16-config`
+    PNG_CONFIG=`command -v libpng16-config`
     if test -z "$PNG_CONFIG"; then
-      PNG_CONFIG=`which libpng14-config`
+      PNG_CONFIG=`command -v libpng14-config`
     fi
     if test -z "$PNG_CONFIG"; then
-      PNG_CONFIG=`which libpng12-config`
+      PNG_CONFIG=`command -v libpng12-config`
     fi
     if test -z "$PNG_CONFIG"; then
-      PNG_CONFIG=`which libpng-config`
+      PNG_CONFIG=`command -v libpng-config`
     fi
     if test -z "$PNG_CONFIG"; then
-      PNG_CONFIG=`which libpng10-config`
+      PNG_CONFIG=`command -v libpng10-config`
     fi
   fi