From 34e3128e9451253755314a491cfaaa07b3d12966 Mon Sep 17 00:00:00 2001
From: Romain Lenglet <address@hidden>
Date: Sun, 2 Aug 2009 10:41:06 +0900
Subject: [PATCH] Make ERLC and ERLCFLAGS def in atconfig conditional to AC_ERLANG_PATH_ERLC. Fix autotest.at for AT_CHECK_EUNIT test.

---
 lib/autoconf/autotest.m4 |    4 +++-
 tests/autotest.at        |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/autoconf/autotest.m4 b/lib/autoconf/autotest.m4
index 29dffac..aec589b 100644
--- a/lib/autoconf/autotest.m4
+++ b/lib/autoconf/autotest.m4
@@ -86,12 +86,14 @@ AUTOTEST_PATH='m4_default([$2], [$1])'
 SHELL=\${CONFIG_SHELL-'$SHELL'}
 m4_provide_if([AC_ERLANG_PATH_ERL], [
 ERL='$ERL'
+])dnl
+m4_provide_if([AC_ERLANG_PATH_ERLC], [
 ERLC='$ERLC'
 ERLCFLAGS='$ERLCFLAGS'
 ])dnl
 ATEOF
 ],
 [m4_provide_if([AC_ERLANG_PATH_ERL], [ERL="$ERL"
-ERLC="$ERLC"
+])m4_provide_if([AC_ERLANG_PATH_ERLC], [ERLC="$ERLC"
 ERLCFLAGS="$ERLCFLAGS"
 ])])])# AC_CONFIG_TESTDIR
diff --git a/tests/autotest.at b/tests/autotest.at
index 03968f7..162bbb7 100644
--- a/tests/autotest.at
+++ b/tests/autotest.at
@@ -1504,7 +1504,7 @@ AT_CHECK([grep '^ERL='\''.*'\' t/atconfig], [], [ignore])
 AT_CHECK([grep '^ERLC='\''.*'\' t/atconfig], [], [ignore])
 AT_CHECK([grep '^ERLCFLAGS='\''.*'\' t/atconfig], [], [ignore])
 
-if test "$HAVE_ERLANG" = yes; then
+if test "$HAVE_ERLANG" = yes && test "$HAVE_EUNIT" = yes; then
   AT_CHECK([cd s && $CONFIG_SHELL ./compile])
 fi
 
@@ -1512,7 +1512,7 @@ AT_CHECK([cd t && $CONFIG_SHELL ./suite], [], [ignore])
 
 if test "$HAVE_EUNIT" = yes; then
   AT_CHECK([grep 1.*successful t/suite.log], [], [ignore])
-  AT_CHECK([grep 0.*skipped t/suite.log], [], [ignore])
+  AT_CHECK([grep -v skipped t/suite.log], [], [ignore])
 else
   AT_CHECK([grep 1.*skipped t/suite.log], [], [ignore])
   AT_CHECK([grep 0.*successful t/suite.log], [], [ignore])
-- 
1.6.3.1