Vendor import Perl 5.6.1

1 files changed, 11 insertions, 7 deletions

diff --git a/contrib/perl5/hints/os2.sh b/contrib/perl5/hints/os2.sh
index 1d9df36..5ffa589 100644
--- a/contrib/perl5/hints/os2.sh
+++ b/contrib/perl5/hints/os2.sh
@@ -93,7 +93,7 @@ if test "$libemx" = "X"; then echo "Cannot find C library!" >&2; fi
 libpth="`echo \"$LIBRARY_PATH\" | tr ';\\\' ' /'`"
 libpth="$libpth $libemx/mt $libemx"
 
-set `emxrev -f emxlibcm`
+set `cmd /c emxrev -f emxlibcm`
 emxcrtrev=$5
 # indented to not put it into config.sh
   _defemxcrtrev=-D_EMX_CRT_REV_=$emxcrtrev
@@ -249,6 +249,8 @@ nm_opt='-p'
 
 ####### We define these functions ourselves
 
+d_strtoll='define'
+d_strtoull='define'
 d_getprior='define'
 d_setprior='define'
 
@@ -281,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
@@ -306,10 +314,6 @@ case "$0$running_c_cmd" in
   *) echo "!!! Apparently we are running a renamed Configure: '$0'." >&2
 esac
 
-# Copy pod:
-
-cp -uf ./README.os2 ./pod/perlos2.pod
-
 # This script UU/usethreads.cbu will get 'called-back' by Configure 
 # after it has prompted the user for whether to use threads.
 cat > UU/usethreads.cbu <<'EOCBU'