diff --git a/configure b/configure
index 2c735faa..0ffb9036 100755
--- a/configure
+++ b/configure
@@ -11137,7 +11137,7 @@ else
   with_libacvpdir=no
 fi
 
-    if test "x$libacvpdir" ; then
+    if test "x$libacvpdir" != "x" ; then
         LDFLAGS="$LDFLAGS -L$libacvpdir/lib"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing acvp_create_test_session" >&5
 $as_echo_n "checking for library containing acvp_create_test_session... " >&6; }
@@ -11207,7 +11207,7 @@ fi
 fi
 
 # If given a libacvp_dir, use that when building things dependent on library, otherwise, use defaults
-if test "x$libacvpdir" ; then
+if test "x$libacvpdir" != "x" ; then
     LIBACVP_LDFLAGS="-L$libacvpdir/lib"
 
     LIBACVP_CFLAGS="-I$libacvpdir/include"
@@ -11295,7 +11295,7 @@ else
 fi
 
 
-    if test "x$with_libcurldir" != xno && test "x$with_libcurldir" != ""; then
+    if test "x$libcurldir" != "x"; then
         LIBCURL_CFLAGS="-I$libcurldir/include"
 
         LIBCURL_LDFLAGS="-L$libcurldir/lib -lcurl"
@@ -11377,7 +11377,7 @@ else
 fi
 
 
-        if test "x$with_libmurldir" != xno && test "x$with_libmurldir" != "" ; then
+    if test "x$libmurldir" != "x"; then
             CFLAGS="$CFLAGS -I$libmurldir -DUSE_MURL"
             LDFLAGS="$LDFLAGS -L$libmurldir -lmurl"
             #only run this test if we are building app; otherwise configure tries to link an example executable and fails because missing dependencies
diff --git a/configure.ac b/configure.ac
index 2c692277..ce1e6b87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -132,7 +132,7 @@ if test "x$disable_lib" = "xyes" ; then
         [Path to libacvp install directory, for use when building the app only])],
         [libacvpdir="$withval"],
         [with_libacvpdir=no])
-    if test "x$libacvpdir" ; then
+    if test "x$libacvpdir" != "x" ; then
         LDFLAGS="$LDFLAGS -L$libacvpdir/lib"
         AC_SEARCH_LIBS([acvp_create_test_session], [acvp], [],
                        [AC_MSG_FAILURE([can't find libacvp library])], [-ldl])
@@ -143,7 +143,7 @@ if test "x$disable_lib" = "xyes" ; then
 fi
 
 # If given a libacvp_dir, use that when building things dependent on library, otherwise, use defaults
-if test "x$libacvpdir" ; then
+if test "x$libacvpdir" != "x" ; then
     AC_SUBST([LIBACVP_LDFLAGS], ["-L$libacvpdir/lib"])
     AC_SUBST([LIBACVP_CFLAGS], ["-I$libacvpdir/include"])
 else
@@ -204,7 +204,7 @@ if test "x$enable_offline" = "xfalse" && test "x$disable_lib" = "xno" ; then
         [libcurldir="$withval"],
         [with_libcurldir=no])
 
-    if test "x$with_libcurldir" != xno && test "x$with_libcurldir" != ""; then
+    if test "x$libcurldir" != "x"; then
         AC_SUBST([LIBCURL_CFLAGS], "-I$libcurldir/include")
         AC_SUBST([LIBCURL_LDFLAGS], "-L$libcurldir/lib -lcurl")
         LDFLAGS="$LDFLAGS -L$libcurldir/lib"
@@ -222,7 +222,7 @@ if test "x$enable_offline" = "xfalse" && test "x$disable_lib" = "xno" ; then
             [libmurldir="$withval"],
             [with_libmurldir=no])
 
-        if test "x$with_libmurldir" != xno && test "x$with_libmurldir" != "" ; then
+    if test "x$libmurldir" != "x"; then
             CFLAGS="$CFLAGS -I$libmurldir -DUSE_MURL"
             LDFLAGS="$LDFLAGS -L$libmurldir -lmurl"
             #only run this test if we are building app; otherwise configure tries to link an example executable and fails because missing dependencies