diff --git a/configure b/configure
index 40aa43b058..e227e22bdb 100755
--- a/configure
+++ b/configure
@@ -4964,7 +4964,7 @@ $as_echo "no" >&6; }
 fi
 
   if test "x$ac_pt_UNAME" = x; then
-    UNAME="No"
+    UNAME=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -4978,7 +4978,7 @@ else
   UNAME="$ac_cv_path_UNAME"
 fi
 
-if test ! x"${UNAME}" = xNo; then
+if test "x${UNAME}" != "x:"; then
    PBX_OSREV=$(${UNAME} -r)
 fi
 
@@ -7702,11 +7702,11 @@ fi
 DOWNLOAD=":"
 DOWNLOAD_TO_STDOUT=
 DOWNLOAD_TIMEOUT=
-if test "${WGET}" != ":" ; then
+if test "x${WGET}" != "x:"; then
   DOWNLOAD=${WGET}
   DOWNLOAD_TO_STDOUT="${WGET} -q -O-"
   DOWNLOAD_TIMEOUT='--timeout=$1'
-elif test "${CURL}" != ":" ; then
+elif test "x${CURL}" != "x:"; then
   DOWNLOAD="${CURL} -O --progress-bar -w \"%{url_effective}\n\""
   DOWNLOAD_TO_STDOUT="${CURL} -Ls"
   DOWNLOAD_TIMEOUT='--max-time $(or $2,$1)'
@@ -7752,7 +7752,7 @@ $as_echo "no" >&6; }
 fi
 
 
-  if test "${FETCH}" != ":" ; then
+  if test "x${FETCH}" != "x:"; then
     DOWNLOAD=${FETCH}
     DOWNLOAD_TO_STDOUT="${FETCH} -o-"
     DOWNLOAD_TIMEOUT='--timeout=$(or $2,$1)'
@@ -8051,21 +8051,22 @@ else
 	PBX_BISON=1
 fi
 
-if test "x${FLEX}" = "x:" ; then
+
+if test "${FLEX}" = ":"; then
 	PBX_FLEX=0
 else
 	PBX_FLEX=1
 fi
 
 
-if test "x${XMLSTARLET}" = "x:" ; then
+if test "${XMLSTARLET}" = ":"; then
 	PBX_XMLSTARLET=0
 else
 	PBX_XMLSTARLET=1
 fi
 
 
-if test "x${BASH}" = "x:" ; then
+if test "${BASH}" = ":"; then
 	PBX_BASH=0
 else
 	PBX_BASH=1
@@ -8164,7 +8165,7 @@ else
   SOXMIX="$ac_cv_prog_SOXMIX"
 fi
 
-if test "${SOXMIX}" != ":" ; then
+if test "x${SOXMIX}" != "x:"; then
 
 $as_echo "#define HAVE_SOXMIX 1" >>confdefs.h
 
@@ -9198,7 +9199,7 @@ JANSSON_BUNDLED=no
 # Check whether --with-jansson-bundled was given.
 if test "${with_jansson_bundled+set}" = set; then :
   withval=$with_jansson_bundled; case "${withval}" in
-		y|yes) JANSSON_BUNDLED=yes ;;
+		y|ye|yes) JANSSON_BUNDLED=yes ;;
 		*) JANSSON_BUNDLED=no ;;
 	esac
 fi
@@ -25135,7 +25136,7 @@ fi
 
 
 
-PG_CONFIG=No
+PG_CONFIG=":"
 if test "${USE_PGSQL}" != "no"; then
    if test "x${PGSQL_DIR}" != "x"; then
       if test -n "$ac_tool_prefix"; then
@@ -25222,7 +25223,7 @@ $as_echo "no" >&6; }
 fi
 
   if test "x$ac_pt_PG_CONFIG" = x; then
-    PG_CONFIG="No"
+    PG_CONFIG=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -25236,7 +25237,7 @@ else
   PG_CONFIG="$ac_cv_path_PG_CONFIG"
 fi
 
-      if test x"${PG_CONFIG}" = xNo; then
+      if test "${PG_CONFIG}" = ":"; then
          { $as_echo "$as_me:${as_lineno-$LINENO}: ***" >&5
 $as_echo "$as_me: ***" >&6;}
          { $as_echo "$as_me:${as_lineno-$LINENO}: *** pg_config was not found in the path you specified:" >&5
@@ -25334,7 +25335,7 @@ $as_echo "no" >&6; }
 fi
 
   if test "x$ac_pt_PG_CONFIG" = x; then
-    PG_CONFIG="No"
+    PG_CONFIG=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -25350,7 +25351,7 @@ fi
 
    fi
 fi
-if test "${PG_CONFIG}" != No; then
+if test "x${PG_CONFIG}" != "x:"; then
    PGSQL_libdir=`${PG_CONFIG} --libdir`
    PGSQL_includedir=`${PG_CONFIG} --includedir`
    if test "x$?" != "x0" ; then
@@ -36609,7 +36610,7 @@ fi
 
 
 ${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
-if test "x${ac_cv_path_CMP}" = "x:"; then
+if test "${ac_cv_path_CMP}" = ":"; then
 	( cd "`pwd`/menuselect" && ./configure )
 elif ${ac_cv_path_CMP} -s makeopts.acbak makeopts.acbak2; then : ; else
 	( cd "`pwd`/menuselect" && ./configure )
diff --git a/configure.ac b/configure.ac
index 6cecdf09e4..6071ef4aaf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -211,8 +211,8 @@ AC_COMPILE_IFELSE(
 AC_SUBST(CONFIG_SIGNED_CHAR)
 
 #  check for uname
-AC_PATH_TOOL([UNAME], [uname], No)
-if test ! x"${UNAME}" = xNo; then
+AC_PATH_TOOL([UNAME], [uname], :)
+if test "x${UNAME}" != "x:"; then
    PBX_OSREV=$(${UNAME} -r)
 fi
 AC_SUBST(PBX_OSREV)
@@ -289,17 +289,17 @@ AC_PATH_PROG([NM], [nm], :)
 DOWNLOAD=":"
 DOWNLOAD_TO_STDOUT=
 DOWNLOAD_TIMEOUT=
-if test "${WGET}" != ":" ; then
+if test "x${WGET}" != "x:"; then
   DOWNLOAD=${WGET}
   DOWNLOAD_TO_STDOUT="${WGET} -q -O-"
   DOWNLOAD_TIMEOUT='--timeout=$1'
-elif test "${CURL}" != ":" ; then
+elif test "x${CURL}" != "x:"; then
   DOWNLOAD="${CURL} -O --progress-bar -w \"%{url_effective}\n\""
   DOWNLOAD_TO_STDOUT="${CURL} -Ls"
   DOWNLOAD_TIMEOUT='--max-time $(or $2,$1)'
 else
   AC_PATH_PROG([FETCH], [fetch], :)
-  if test "${FETCH}" != ":" ; then
+  if test "x${FETCH}" != "x:"; then
     DOWNLOAD=${FETCH}
     DOWNLOAD_TO_STDOUT="${FETCH} -o-"
     DOWNLOAD_TIMEOUT='--timeout=$(or $2,$1)'
@@ -351,29 +351,30 @@ else
 	PBX_BISON=1
 fi
 AC_SUBST(PBX_BISON)
-if test "x${FLEX}" = "x:" ; then
+
+if test "${FLEX}" = ":"; then
 	PBX_FLEX=0
 else
 	PBX_FLEX=1
 fi
 AC_SUBST(PBX_FLEX)
 
-if test "x${XMLSTARLET}" = "x:" ; then
+if test "${XMLSTARLET}" = ":"; then
 	PBX_XMLSTARLET=0
 else
 	PBX_XMLSTARLET=1
 fi
 AC_SUBST(PBX_XMLSTARLET)
 
-if test "x${BASH}" = "x:" ; then
+if test "${BASH}" = ":"; then
 	PBX_BASH=0
 else
 	PBX_BASH=1
 fi
 AC_SUBST(PBX_BASH)
 
-AC_CHECK_TOOL([SOXMIX], [soxmix], [:])
-if test "${SOXMIX}" != ":" ; then
+AC_CHECK_TOOL([SOXMIX], [soxmix], :)
+if test "x${SOXMIX}" != "x:"; then
 	AC_DEFINE([HAVE_SOXMIX], 1, [Define to 1 if your system has soxmix application.])
 fi
 
@@ -441,7 +442,7 @@ AC_ARG_WITH([jansson-bundled],
 	[AS_HELP_STRING([--with-jansson-bundled],
 		[Use bundled jansson library])],
 	[case "${withval}" in
-		y|yes) JANSSON_BUNDLED=yes ;;
+		y|ye|yes) JANSSON_BUNDLED=yes ;;
 		*) JANSSON_BUNDLED=no ;;
 	esac])
 
@@ -2393,11 +2394,11 @@ AST_EXT_LIB_CHECK([OSS], [ossaudio], [], [linux/soundcard.h])
 AST_EXT_LIB_CHECK([OSS], [ossaudio], [], [sys/soundcard.h])
 AST_EXT_LIB_CHECK([OSS], [ossaudio], [oss_ioctl_mixer], [soundcard.h])
 
-PG_CONFIG=No
+PG_CONFIG=":"
 if test "${USE_PGSQL}" != "no"; then
    if test "x${PGSQL_DIR}" != "x"; then
-      AC_PATH_TOOL([PG_CONFIG], [pg_config], No, [${PGSQL_DIR}/bin])
-      if test x"${PG_CONFIG}" = xNo; then
+      AC_PATH_TOOL([PG_CONFIG], [pg_config], :, [${PGSQL_DIR}/bin])
+      if test "${PG_CONFIG}" = ":"; then
          AC_MSG_NOTICE([***])
          AC_MSG_NOTICE([*** pg_config was not found in the path you specified:])
          AC_MSG_NOTICE([*** ${PGSQL_DIR}/bin])
@@ -2406,10 +2407,10 @@ if test "${USE_PGSQL}" != "no"; then
          exit 1
       fi
    else
-      AC_PATH_TOOL([PG_CONFIG], [pg_config], No)
+      AC_PATH_TOOL([PG_CONFIG], [pg_config], :)
    fi
 fi
-if test "${PG_CONFIG}" != No; then
+if test "x${PG_CONFIG}" != "x:"; then
    PGSQL_libdir=`${PG_CONFIG} --libdir`
    PGSQL_includedir=`${PG_CONFIG} --includedir`
    if test "x$?" != "x0" ; then
@@ -2946,7 +2947,7 @@ fi
 AC_OUTPUT
 
 ${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
-if test "x${ac_cv_path_CMP}" = "x:"; then
+if test "${ac_cv_path_CMP}" = ":"; then
 	( cd "`pwd`/menuselect" && ./configure )
 elif ${ac_cv_path_CMP} -s makeopts.acbak makeopts.acbak2; then : ; else
 	( cd "`pwd`/menuselect" && ./configure )