Tweak the floating point output routine preferences.

p4raw-id: //depot/metaconfig@6751

diff --git a/U/compline/d_gconvert.U b/U/compline/d_gconvert.U
index 9171510..be381c7 100644 (file)
--- a/U/compline/d_gconvert.U
+++ b/U/compline/d_gconvert.U
@@ -54,20 +54,19 @@
 ?F:!try
 ?X: 
 : Check how to convert floats to strings.
-if test "X$d_Gconvert" = X; then
-       echo " "
-       echo "Checking for an efficient way to convert floats to strings."
-       echo " " > try.c
-       case "$uselongdouble" in
-       "$define") echo "#define USE_LONG_DOUBLE" >>try.c ;;
-       esac
-       case "$d_longdbl" in
-       "$define") echo "#define HAS_LONG_DOUBLE" >>try.c ;;
-       esac
-       case "$d_PRIgldbl" in
-       "$define") echo "#define HAS_PRIgldbl"    >>try.c ;;
-       esac
-       $cat >>try.c <<EOP
+echo " "
+echo "Checking for an efficient way to convert floats to strings."
+echo " " > try.c
+case "$uselongdouble" in
+"$define") echo "#define USE_LONG_DOUBLE" >>try.c ;;
+esac
+case "$d_longdbl" in
+"$define") echo "#define HAS_LONG_DOUBLE" >>try.c ;;
+esac
+case "$d_PRIgldbl" in
+"$define") echo "#define HAS_PRIgldbl"    >>try.c ;;
+esac
+$cat >>try.c <<EOP
 #ifdef TRY_gconvert
 #define Gconvert(x,n,t,b) gconvert((x),(n),(t),(b))
 char *myname = "gconvert";
@@ -172,44 +171,48 @@ EOP
 ?X: (e.g. that function may be in a problematic /usr/ucblib library, and
 ?X: the user may or may not choose to use -lucb stuff.)
 ?X: Any other hint file (or previous config.sh) setting is left intact.
-       case "$d_Gconvert" in
-       gconvert*) xxx_list='gconvert gcvt sprintf' ;;
-       gcvt*) xxx_list='gcvt gconvert sprintf' ;;
-       sprintf*) xxx_list='sprintf gconvert gcvt' ;;
-       *) xxx_list='gconvert gcvt sprintf' ;;
-       esac
-
-        case "$d_longdbl$uselongdouble$d_qgcvt" in
-        "$define$define$define") xxx_list="`echo $xxx_list|sed 's/gcvt/qgcvt gcvt/'`" ;;
-       esac
-
-       for xxx_convert in $xxx_list; do
-               echo "Trying $xxx_convert..."
-               $rm -f try try$_o
-               set try -DTRY_$xxx_convert
-               if eval $compile; then
-                       echo "$xxx_convert() found." >&4
-                       if ./try; then
-                               echo "I'll use $xxx_convert to convert floats into a string." >&4
-                               break;
-                       else
-                               echo "...But $xxx_convert didn't work as I expected."
-                       fi
+case "$d_Gconvert" in
+gconvert*) xxx_list='gconvert gcvt sprintf' ;;
+gcvt*) xxx_list='gcvt gconvert sprintf' ;;
+*) xxx_list='sprintf gconvert gcvt' ;;
+esac
+
+case "$d_longdbl$uselongdouble" in
+"$define$define")
+    xxx_list="`echo $xxx_list|sed s/sprintf//`" 
+    xxx_list="sprintf $xxx_list"
+    case "$d_qgcvt" in
+    "$define") xxx_list="qgcvt $xxx_list" ;;
+    esac
+    ;;
+esac
+
+for xxx_convert in $xxx_list; do
+       echo "Trying $xxx_convert..."
+       $rm -f try try$_o
+       set try -DTRY_$xxx_convert
+       if eval $compile; then
+               echo "$xxx_convert() found." >&4
+               if ./try; then
+                       echo "I'll use $xxx_convert to convert floats into a string." >&4
+                       break;
                else
-                       echo "$xxx_convert NOT found." >&4
+                       echo "...But $xxx_convert didn't work as I expected."
                fi
-       done
-               
-       case "$xxx_convert" in
-       gconvert) d_Gconvert='gconvert((x),(n),(t),(b))' ;;
-       gcvt) d_Gconvert='gcvt((x),(n),(b))' ;;
-       qgcvt) d_Gconvert='qgcvt((x),(n),(b))' ;;
-       *) case "$uselongdouble$d_longdbl$d_PRIgldbl" in
-          "$define$define$define")
-             d_Gconvert="sprintf((b),\"%.*$sPRIgldbl\",(n),(x))" ;;
-          *) d_Gconvert='sprintf((b),"%.*g",(n),(x))' ;;
-          esac
-          ;;  
-       esac
-fi
+       else
+               echo "$xxx_convert NOT found." >&4
+       fi
+done
+       
+case "$xxx_convert" in
+gconvert) d_Gconvert='gconvert((x),(n),(t),(b))' ;;
+gcvt) d_Gconvert='gcvt((x),(n),(b))' ;;
+qgcvt) d_Gconvert='qgcvt((x),(n),(b))' ;;
+*) case "$uselongdouble$d_longdbl$d_PRIgldbl" in
+   "$define$define$define")
+      d_Gconvert="sprintf((b),\"%.*$sPRIgldbl\",(n),(x))" ;;
+   *) d_Gconvert='sprintf((b),"%.*g",(n),(x))' ;;
+   esac
+   ;;  
+esac