X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Fos2.sh;h=77085a89b47c330f64425c794e25facc480cbb15;hb=522b859adcc800ddbbe593fba580633bb305644f;hp=57c3766f5f6a648e384daa70278b8cdfdb9c10dd;hpb=ee45ea83446ac2a5509132d56264e1dd7b9ae1f6;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/os2.sh b/hints/os2.sh
index 57c3766..77085a8 100644
--- a/hints/os2.sh
+++ b/hints/os2.sh
@@ -108,6 +108,18 @@ exe_ext='.exe'
 # We provide it
 i_dlfcn='define'
 
+# The default one uses exponential notation between 0.0001 and 0.1
+d_Gconvert='gcvt_os2((x),(n),(b))'
+
+cat > UU/uselongdouble.cbu <<'EOCBU'
+# This script UU/uselongdouble.cbu will get 'called-back' by Configure
+# after it has prompted the user for whether to use long doubles.
+# If we will use them, let Configure choose us a Gconvert.
+case "$uselongdouble:$d_longdbl:$d_sqrtl:$d_modfl" in
+"$define:$define:$define:$define") d_Gconvert='' ;;
+esac
+EOCBU
+
 # -Zomf build has a problem with _exit() *flushing*, so the test
 # gets confused:
 fflushNULL="define"
@@ -169,7 +181,7 @@ else
     else
 	d_fork='undef'
     fi
-    lddlflags="-Zdll -Zomf -Zmt -Zcrtdll -Zlinker /e:2 $ld_dll_optimize"
+    lddlflags="-Zdll -Zomf -Zmt -Zcrtdll -Zlinker /e:2"
     # Recursive regmatch may eat 2.5M of stack alone.
     ldflags='-Zexe -Zomf -Zmt -Zcrtdll -Zstack 32000 -Zlinker /e:2'
     if [ $emxcrtrev -ge 50 ]; then 
@@ -282,6 +294,15 @@ else
     fi
 fi
 
+for f in less.exe less.sh less.ksh less.cmd more.exe more.sh more.ksh more.cmd ; do
+  if test -z "$pager"; then
+    pager="`./UU/loc $f '' $pth`"
+  fi
+done
+if test -z "$pager"; then
+  pager='cmd /c more'
+fi
+
 # Apply patches if needed
 case "$0$running_c_cmd" in
   *[/\\]Configure|*[/\\]Configure.|Configure|Configure.) # Skip Configure.cmd
@@ -409,6 +430,22 @@ $define|true|[yY]*)
 esac
 EOCBU
 
+if test -z "$cryptlib"; then
+	cryptlib=`UU/loc crypt$lib_ext "" $libpth`
+	if $test -n "$cryptlib"; then
+		cryptlib=-lcrypt
+	else
+		cryptlib=`UU/loc ufc$lib_ext "" $libpth`
+		if $test -n "$cryptlib"; then
+			cryptlib=-lufc
+		fi
+	fi
+fi
+if test -n "$cryptlib"; then
+	libs="$libs $cryptlib"
+	# d_crypt=define
+fi
+
 # Now install the external modules. We are in the ./hints directory.
 
 cd ./os2/OS2
@@ -421,6 +458,7 @@ cp -rfu * ../../ext/OS2/
 
 # Install tests:
 
+cp -uf ../*.t ../../t/lib
 for xxx in * ; do
 	if $test -d $xxx/t; then
 		cp -uf $xxx/t/*.t ../../t/lib
@@ -443,3 +481,4 @@ esac
 
 # Now go back
 cd ../..
+cp os2/*.t t/lib