[Configure PATCH] for OS/2

[Two hunks to Configure failed to apply due to clashes]

p4raw-id: //depot/perl@818

2 files changed, 20 insertions, 14 deletions

diff --git a/Configure b/Configure
index d527d96117..af22c1b77f 100755
--- a/Configure
+++ b/Configure
@@ -4341,7 +4341,7 @@ $rm -f try try.* core
 compile='
 mc_file=$1;
 shift;
-$cc $optimize $ccflags $ldflags -o ${mc_file}$_exe $* ${mc_file}.c $libs > /dev/null 2>&1;'
+$cc $optimize $ccflags $ldflags -o ${mc_file} $* ${mc_file}.c $libs > /dev/null 2>&1;'
 
 echo " "
 echo "Checking for GNU C Library..." >&4
@@ -5137,7 +5137,9 @@ EOM
 		next4*)	xxx='DYLD_LIBRARY_PATH' ;;
 		*)		xxx='LD_LIBRARY_PATH' ;;
 		esac
-		$cat <<EOM  | $tee -a ../config.msg >&4
+		case "$osname" in
+		    os2) ;;
+		    *) $cat <<EOM  | $tee -a ../config.msg >&4
 
 To build perl, you must add the current working directory to your
 $xxx environment variable before running make.  You can do
@@ -5148,6 +5150,7 @@ for Bourne-style shells, or
 for Csh-style shells.  You *MUST* do this before running make.
 
 EOM
+		esac
 		;;
 	*)	useshrplib='false' ;;
 	esac
@@ -8006,7 +8009,7 @@ else
 		echo "You don't have Berkeley networking in libc$_a..." >&4
 		if test -f /usr/lib/libnet$_a; then
 			( (nm $nm_opt /usr/lib/libnet$_a | eval $nm_extract) ||  \
-			ar t /usr/lib/libnet$_a) 2>/dev/null >> libc.list
+			$ar t /usr/lib/libnet$_a) 2>/dev/null >> libc.list
 			if $contains socket libc.list >/dev/null 2>&1; then
 			echo "...but the Wollongong group seems to have hacked it in." >&4
 				socketlib="-lnet"
diff --git a/hints/os2.sh b/hints/os2.sh
index f11eeb36ed..2293adf446 100644
--- a/hints/os2.sh
+++ b/hints/os2.sh
@@ -33,25 +33,25 @@ cc='gcc'
  set $C_INCLUDE_PATH
  usrinc="$@"
  IFS="$oifs"
- tryman="`../UU/loc . /man $tryman`"
+ tryman="`./UU/loc . /man $tryman`"
  tryman="`echo $tryman | tr '\\\' '/'`"
  
  # indented to avoid having it *two* times at start
- libemx="`../UU/loc os2.a /emx/lib $libemx`"
+ libemx="`./UU/loc os2.a /emx/lib $libemx`"
 
-usrinc="`../UU/loc stdlib.h /emx/include $usrinc`"
+usrinc="`./UU/loc stdlib.h /emx/include $usrinc`"
 usrinc="`dirname $usrinc | tr '\\\' '/'`"
 libemx="`dirname $libemx | tr '\\\' '/'`"
 
 if test -d $tryman/man1; then
   sysman="$tryman/man1"
 else
-  sysman="`../UU/loc . /man/man1 c:/man/man1 c:/usr/man/man1 d:/man/man1 d:/usr/man/man1 e:/man/man1 e:/usr/man/man1 f:/man/man1 f:/usr/man/man1 g:/man/man1 g:/usr/man/man1 /usr/man/man1`"
+  sysman="`./UU/loc . /man/man1 c:/man/man1 c:/usr/man/man1 d:/man/man1 d:/usr/man/man1 e:/man/man1 e:/usr/man/man1 f:/man/man1 f:/usr/man/man1 g:/man/man1 g:/usr/man/man1 /usr/man/man1`"
 fi
 
 emxpath="`dirname $libemx`"
 if test ! -d "$emxpath"; then 
-  emxpath="`../UU/loc . /emx c:/emx d:/emx e:/emx f:/emx g:/emx h:/emx /emx`"
+  emxpath="`./UU/loc . /emx c:/emx d:/emx e:/emx f:/emx g:/emx h:/emx /emx`"
 fi
 
 if test ! -d "$libemx"; then 
@@ -61,7 +61,7 @@ if test ! -d "$libemx"; then
   if test -d "$LIBRARY_PATH"; then
     libemx="$LIBRARY_PATH"
   else
-    libemx="`../UU/loc . X c:/emx/lib d:/emx/lib e:/emx/lib f:/emx/lib g:/emx/lib h:/emx/lib /emx/lib`"
+    libemx="`./UU/loc . X c:/emx/lib d:/emx/lib e:/emx/lib f:/emx/lib g:/emx/lib h:/emx/lib /emx/lib`"
   fi
 fi
 
@@ -72,12 +72,12 @@ if test ! -d "$usrinc"; then
     if test -d "$C_INCLUDE_PATH"; then
       usrinc="$C_INCLUDE_PATH"
     else
-      usrinc="`../UU/loc . X c:/emx/include d:/emx/include e:/emx/include f:/emx/include g:/emx/include h:/emx/include /emx/include`"
+      usrinc="`./UU/loc . X c:/emx/include d:/emx/include e:/emx/include f:/emx/include g:/emx/include h:/emx/include /emx/include`"
     fi
   fi
 fi
 
-rsx="`../UU/loc rsx.exe undef $pth`"
+rsx="`./UU/loc rsx.exe undef $pth`"
 
 if test "$libemx" = "X"; then echo "Cannot find C library!" >&2; fi
 
@@ -164,6 +164,9 @@ else
     usedl='define'
 fi
 
+# indented to miss config.sh
+  _ar="$ar"
+
 # To get into config.sh (should start at the beginning of line)
 # or you can put it into config.over.
 plibext="$plibext"
@@ -263,11 +266,11 @@ fi
 
 # Copy pod:
 
-cp ../README.os2 ../pod/perlos2.pod
+cp ./README.os2 ./pod/perlos2.pod
 
 # Now install the external modules. We are in the ./hints directory.
 
-cd ../os2/OS2
+cd ./os2/OS2
 
 if ! test -d ../../ext/OS2 ; then
    mkdir ../../ext/OS2
@@ -295,4 +298,4 @@ done
 
 
 # Now go back
-cd ../../hints
+cd ../..