diff --git a/configure b/configure
index 297800c697..ebcfa6d335 100755
--- a/configure
+++ b/configure
@@ -23168,7 +23168,9 @@ fi
 
 # Check whether --with-cmocka was given.
 if test "${with_cmocka+set}" = set; then :
-  withval=$with_cmocka;
+  withval=$with_cmocka; :
+else
+  with_cmocka=no
 fi
 
 
diff --git a/configure.ac b/configure.ac
index ada6468aad..16560e7780 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4793,7 +4793,8 @@ fi
 #
 
 AC_ARG_WITH([cmocka],
-	    [AS_HELP_STRING([--with-cmocka=no],[enable cmocka based tests (default is no)])])
+	    [AS_HELP_STRING([--with-cmocka=no],[enable cmocka based tests (default is no)])],
+	    [:],[with_cmocka=no])
 
 AS_CASE([$with_cmocka],
 	[no],[:],