diff options
| author | Ilya Zakharevich <ilya@math.berkeley.edu> | 2003-03-31 04:43:37 -0800 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2003-04-01 16:32:03 +0000 |
| commit | 5c728af092d5febae92774d9106a235643cb49e5 (patch) | |
| tree | f2b54077514f1f871504f57b7633df9dcdb72876 /Configure | |
| parent | 15978375e3ac30958ab56d2e88249ad742eecd30 (diff) | |
| download | perl-5c728af092d5febae92774d9106a235643cb49e5.tar.gz | |
Integrate:
[ 19106]
Subject: [PATCH 5.8.1 @19053] OS/2-related patches
Message-ID: <20030331204337.GA3634@math.berkeley.edu>
and regen Configure.
p4raw-link: @19106 on //depot/maint-5.8/perl: 8257dec7ed17c0d4d721411d2a781ceadf724da5
p4raw-id: //depot/perl@19120
p4raw-edited: from //depot/maint-5.8/perl@19118 'edit in' embedvar.h
(@18804..)
p4raw-integrated: from //depot/maint-5.8/perl@19118 'copy in'
os2/Makefile.SHs os2/OS2/ExtAttr/Changes
os2/OS2/ExtAttr/ExtAttr.pm os2/OS2/PrfDB/Changes
os2/OS2/PrfDB/PrfDB.pm os2/OS2/REXX/DLL/DLL.pm
os2/OS2/REXX/REXX.pm os2/dl_os2.c os2/os2thread.h (@17645..)
ext/threads/threads.xs (@18619..) perlio.c (@18948..)
Makefile.SH (@19061..) 'ignore' embed.pl (@18872..) embed.h
(@19011..) embed.fnc (@19030..) 'merge in' os2/os2ish.h
(@17645..) os2/os2.c (@18347..) perlapi.h (@18804..) perlvars.h
(@18808..) makedef.pl (@18896..) intrpvar.h (@18920..) sv.c
(@18961..)
p4raw-edited: from //depot/maint-5.8/perl@19106 'edit in' Configure
(@19040..)
p4raw-integrated: from //depot/maint-5.8/perl@19106 'copy in' reentr.h
(@18850..) reentr.c reentr.pl (@18922..)
Diffstat (limited to 'Configure')
| -rwxr-xr-x | Configure | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -20,7 +20,7 @@ # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $ # -# Generated on Tue Mar 18 09:54:18 EET 2003 [metaconfig 3.0 PL70] +# Generated on Tue Apr 1 20:39:33 EET DST 2003 [metaconfig 3.0 PL70] # (with additional metaconfig patches by perlbug@perl.org) cat >c1$$ <<EOF @@ -71,11 +71,12 @@ esac : Proper separator for the PATH environment variable p_=: : On OS/2 this directory should exist if this is not floppy only system :-] -if test -d c:/. ; then +if test -d c:/. || ( uname -a | grep -i 'os\(/\|\)2' ) 2>&1 >/dev/null ; then if test -n "$OS2_SHELL"; then p_=\; PATH=`cmd /c "echo %PATH%" | tr '\\\\' / ` OS2_SHELL=`cmd /c "echo %OS2_SHELL%" | tr '\\\\' / | tr '[A-Z]' '[a-z]'` + is_os2=yes elif test -n "$DJGPP"; then case "X${MACHTYPE:-nonesuchmach}" in *cygwin) ;; @@ -1195,7 +1196,7 @@ elif test -f "/system/gnu_library/bin/ar.pm"; then elif test -n "$DJGPP"; then : DOS DJGPP _exe=".exe" -elif test -d c:/. ; then +elif test -d c:/. -o -n "$is_os2" ; then : OS/2 or cygwin _exe=".exe" fi @@ -3137,6 +3138,9 @@ EOM openbsd) osname=openbsd osvers="$3" ;; + os2) osname=os2 + osvers="$4" + ;; POSIX-BC | posix-bc ) osname=posix-bc osvers="$3" ;; @@ -3255,7 +3259,7 @@ EOM osname=news_os fi $rm -f UU/kernel.what - elif test -d c:/.; then + elif test -d c:/. -o -n "$is_os2" ; then set X $myuname osname=os2 osvers="$5" @@ -4978,6 +4982,7 @@ echo "Your cpp writes the filename in the $pos field of the line." case "$osname" in vos) cppfilter="tr '\\\\>' '/' |" ;; # path component separator is > +os2) cppfilter="sed -e 's|\\\\\\\\|/|g' |" ;; # path component separator is \ *) cppfilter='' ;; esac : locate header file |