From 49da10eca77ec1eec5c2a6a1711db9610cbc9e39 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 14 Feb 2014 18:57:12 +0000
Subject: [PATCH] Don't run perl examples/tests if Test::More is not available

The test-suite requires Test::More and the local versions of Test::More
were removed in 1d1e8650a31ae90ca44564565a7c5fa680bc1cba. They are not
always distributed with Perl, such as Perl 5.16 in Fedora.
---
 Examples/test-suite/perl5/README | 32 +++++++++-----------------------
 configure.ac                     |  9 ++++++++-
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/Examples/test-suite/perl5/README b/Examples/test-suite/perl5/README
index 14eb5277e..804dec8e8 100644
--- a/Examples/test-suite/perl5/README
+++ b/Examples/test-suite/perl5/README
@@ -5,28 +5,14 @@ Any testcases which have _runme.pl appended after the testcase name will be dete
 Test::More Support
 ==
 
-Test::More and Test::Harness are two of the standard perl test harness
-tools. Support has been added for these modules as of 1.3.28. If
-adding a new test to this suite, please use Test::More. 
+Test::More is a standard perl test harness tool.
+Support was added for for using Test::More in 1.3.28.
+If adding a new test to this suite, please use Test::More.
 
-Currently converted test cases include:
+There are a few legacy test cases which do not use Test::More and these ought to be converted:
 
-* operator_overload
-* operator_overload_break
-* package
-* overload_simple
-* apply_strings
-* char_strings
-* default_args
-* enum_thorough
-* global_vars
-* import_nomodule
-* inherit
-* li_cdata_carrays
-* li_std_string
-* member_pointer
-* multiple_inheritance
-* primitive_ref
-* template_default_arg
-* unions
-* voidtest
+disown
+imports
+overload_copy
+profiletest
+template_ref_type
diff --git a/configure.ac b/configure.ac
index 549ac1390..02775b0f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -850,6 +850,13 @@ if test -n "$PERL"; then
       AC_MSG_RESULT(not found)
       else
       AC_MSG_RESULT($PERL5LDFLAGS)
+    fi
+    AC_MSG_CHECKING(for Perl5 Test::More module) # For test-suite
+    PERL5TESTMORE=`($PERL -e 'use Test::More; print "good";') 2>/dev/null`
+    if test -z "$PERL5TESTMORE" ; then
+      AC_MSG_RESULT(not found)
+      else
+      AC_MSG_RESULT(found)
     fi
 	else
 		AC_MSG_RESULT(unable to determine perl5 configuration)
@@ -2185,7 +2192,7 @@ AC_SUBST(SKIP_TCL)
 
 
 SKIP_PERL5=
-if test -z "$PERL" || test -z "$PERL5EXT" ; then
+if test -z "$PERL" || test -z "$PERL5EXT" || test -z "$PERL5TESTMORE"; then
     SKIP_PERL5="1"
 fi
 AC_SUBST(SKIP_PERL5)