Finishing merge of rt46933 (Kyua)

1 files changed, 5 insertions, 6 deletions

diff --git a/configure b/configure
index a93fb7ca..e9b86494 100755
--- a/configure
+++ b/configure
@@ -649,6 +649,7 @@ ac_prefix_program
 DISTCHECK_ATF_CONFIGURE_FLAG
 HAVE_ATF_FALSE
 HAVE_ATF_TRUE
+UNITTESTS
 pkgcfg_found
 ATF_BIN
 ATF_LDFLAGS
@@ -5501,8 +5502,8 @@ if test "$enable_relay_port" = "yes"; then
 $as_echo "#define RELAY_PORT 1" >>confdefs.h
 
 else
-    # so we can report below
-    enable_relay_port="no"
+	# so we can report below
+	enable_relay_port="no"
 fi
 
 # PARANOIA is off by default (until we can test it with all features)
@@ -5693,10 +5694,8 @@ fi
                 ATF_BIN=$atf_path/bin
         fi
 
-        if test ! -x $ATF_BIN/atf-run  -o  ! -x $ATF_BIN/atf-report ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: atf-run/atf-report not found, assuming they are in your path" >&5
-$as_echo "$as_me: WARNING: atf-run/atf-report not found, assuming they are in your path" >&2;}
-        fi
+        UNITTESTS=tests
+