[inseperable differences to perl 5.004_03]

[p5sagit/p5-mst-13.2.git] / os2 / diff.configure

diff --git a/os2/diff.configure b/os2/diff.configure
index 6d108c7..9f42dc1 100644 (file)
--- a/os2/diff.configure
+++ b/os2/diff.configure
@@ -51,7 +51,16 @@
  case "$libs" in
  '') ;;
  *)  for thislib in $libs; do
-@@ -4136,6 +4144,10 @@
+@@ -3972,6 +3980,8 @@
+                       :
+               elif try=`./loc $thislib X $libpth`; $test -f "$try"; then
+                       :
++              elif try=`./loc $thislib$lib_ext X $libpth`; $test -f "$try"; then
++                      :
+               elif try=`./loc Slib$thislib$lib_ext X $xlibpth`; $test -f "$try"; then
+                       :
+               else
+@@ -4156,6 +4166,10 @@
        eval $xscan;\
        $contains '^fprintf$' libc.list >/dev/null 2>&1; then
                eval $xrun
@@ -153,8 +162,8 @@
  EOCP
  : check sys/file.h first to get FREAD on Sun
  if $test `./findhdr sys/file.h` && \
--        $cc $ccflags "-DI_SYS_FILE" -o open3 $ldflags open3.c $libs ; then
-+        $cc $ldflags $ccflags "-DI_SYS_FILE" -o open3 $ldflags open3.c $libs ; then
+-        $cc $ccflags "-DI_SYS_FILE" -o open3 $ldflags open3.c $libs >/dev/null 2>&1 ; then
++        $cc $ldflags $ccflags "-DI_SYS_FILE" -o open3 $ldflags open3.c $libs >/dev/null 2>&1 ; then
        h_sysfile=true;
        echo "<sys/file.h> defines the O_* constants..." >&4
        if ./open3; then
@@ -162,8 +171,8 @@
                val="$undef"
        fi
  elif $test `./findhdr fcntl.h` && \
--        $cc $ccflags "-DI_FCNTL" -o open3 $ldflags open3.c $libs ; then
-+        $cc $ldflags $ccflags "-DI_FCNTL" -o open3 $ldflags open3.c $libs ; then
+-        $cc $ccflags "-DI_FCNTL" -o open3 $ldflags open3.c $libs >/dev/null 2>&1 ; then
++        $cc $ldflags $ccflags "-DI_FCNTL" -o open3 $ldflags open3.c $libs >/dev/null 2>&1 ; then
        h_fcntl=true;
        echo "<fcntl.h> defines the O_* constants..." >&4
        if ./open3; then
@@ -194,7 +203,31 @@
                dflt=`./try`
                case "$dflt" in
                [1-4][1-4][1-4][1-4]|12345678|87654321)
-@@ -8692,7 +8714,7 @@
+@@ -8711,18 +8735,18 @@
+ $cc $ccflags -c bar1.c >/dev/null 2>&1
+ $cc $ccflags -c bar2.c >/dev/null 2>&1
+ $cc $ccflags -c foo.c >/dev/null 2>&1
+-ar rc bar$lib_ext bar2.o bar1.o >/dev/null 2>&1
++$ar rc bar$lib_ext bar2.o bar1.o >/dev/null 2>&1
+ if $cc $ccflags $ldflags -o foobar foo.o bar$lib_ext $libs > /dev/null 2>&1 &&
+       ./foobar >/dev/null 2>&1; then
+-      echo "ar appears to generate random libraries itself."
++      echo "$ar appears to generate random libraries itself."
+       orderlib=false
+       ranlib=":"
+-elif ar ts bar$lib_ext >/dev/null 2>&1 &&
++elif $ar ts bar$lib_ext >/dev/null 2>&1 &&
+       $cc $ccflags $ldflags -o foobar foo.o bar$lib_ext $libs > /dev/null 2>&1 &&
+       ./foobar >/dev/null 2>&1; then
+-              echo "a table of contents needs to be added with 'ar ts'."
++              echo "a table of contents needs to be added with '$ar ts'."
+               orderlib=false
+-              ranlib="ar ts"
++              ranlib="$ar ts"
+ else
+       case "$ranlib" in
+       :) ranlib='';;
+@@ -8794,7 +8818,7 @@
        '') $echo $n ".$c"
                if $cc $ccflags \
                $i_time $i_systime $i_systimek $sysselect $s_timeval $s_timezone \