From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Sat, 3 Mar 2001 17:11:55 +0000 (+0000)
Subject: Integrate changes #8997,8999 from maintperl.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=68a5ccec238ff20626c185a03684f758a1c86e1b;p=p5sagit%2Fp5-mst-13.2.git

Integrate changes #8997,8999 from maintperl.

Subject: [PATCH 5.6.1] compiling on OS/2
(Better error message from hints/os2.sh)

Subject: [PATCH 5.6.1] syslog.t

p4raw-link: @8999 on //depot/maint-5.6/perl: 1d1f4060a256037d3512259fe4c8a06dfa47e060
p4raw-link: @8997 on //depot/maint-5.6/perl: 44fb3a8ab385118a630b811ac7a33489c856e76b

p4raw-id: //depot/perl@9000
p4raw-integrated: from //depot/maint-5.6/perl@8996 'copy in'
	hints/os2.sh (@8156..) 'merge in' t/lib/syslog.t (@8173..)
---

diff --git a/hints/os2.sh b/hints/os2.sh
index 7a99de0..5ffa589 100644
--- a/hints/os2.sh
+++ b/hints/os2.sh
@@ -283,8 +283,14 @@ case "$0$running_c_cmd" in
 	# Not patched!
 	if test -f ./Configure.cmd ; then
 	    echo "!!!" >&2
-	    echo "!!! ./Configure not patched, but ./Configure.cmd exits" >&2
-	    echo "!!! Do not know what to do!" >&2
+	    echo "!!! I see that what is running is ./Configure." >&2
+	    echo "!!! ./Configure is not patched, but ./Configure.cmd exists." >&2
+	    echo "!!!" >&2
+	    echo "!!! You are supposed to run Configure.cmd, not Configure" >&2
+	    echo "!!!  after an automagic patching." >&2
+	    echo "!!!" >&2
+	    echo "!!! If you insist on running Configure, please" >&2
+	    echo "!!!  patch it manually from ./os2/diff.configure." >&2
 	    echo "!!!" >&2
 	    exit 2
 	fi
diff --git a/t/lib/syslog.t b/t/lib/syslog.t
index 04adb6b..801e882 100755
--- a/t/lib/syslog.t
+++ b/t/lib/syslog.t
@@ -22,6 +22,15 @@ BEGIN {
     }
 }
 
+BEGIN {
+  eval {require Sys::Syslog} or do {
+    if ($@ =~ /Your vendor has not/) {
+      print "1..0 # Skipped: missing macros\n";
+      exit 0;
+    }
+  }
+}
+
 use Sys::Syslog qw(:DEFAULT setlogsock);
 
 # Test this to 1 if your syslog accepts udp connections.