Regularize the call-back units (and fix a bug in #5330).

p4raw-id: //depot/cfgperl@5331

4 files changed, 19 insertions, 21 deletions

diff --git a/hints/aix.sh b/hints/aix.sh
index 6e8a4b3c1c..a22ca82a66 100644
--- a/hints/aix.sh
+++ b/hints/aix.sh
@@ -235,7 +235,7 @@ esac
 EOCBU
 
 # This script UU/use64bitint.cbu will get 'called-back' by Configure 
-# after it has prompted the user for whether to use 64 bits.
+# after it has prompted the user for whether to use 64 bit integers.
 cat > UU/use64bitint.cbu <<'EOCBU'
 case "$use64bitint" in
 $define|true|[yY]*)
@@ -252,9 +252,9 @@ EOM
 esac
 EOCBU
 
-# This script UU/use64bitall.cbu will get 'called-back' by Configure 
-# after it has prompted the user for whether to use full 64-bitness.
 cat > UU/use64bitall.cbu <<'EOCBU'
+# This script UU/use64bitall.cbu will get 'called-back' by Configure 
+# after it has prompted the user for whether to be maximally 64-bitty.
 case "$use64bitall" in
 $define|true|[yY]*)
 	    case "`oslevel`" in
@@ -351,9 +351,9 @@ EOM
 esac
 EOCBU
 
+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.
-cat > UU/uselongdouble.cbu <<'EOCBU'
 case "$uselongdouble" in
 $define|true|[yY]*)
 	ccflags="$ccflags -qlongdouble"
diff --git a/hints/hpux.sh b/hints/hpux.sh
index ae905b3c5a..6d65223bcb 100644
--- a/hints/hpux.sh
+++ b/hints/hpux.sh
@@ -298,9 +298,9 @@ EOSH
 #          (warning) Use of GR3 when frame >= 8192 may cause conflict.
 #     These warnings are harmless and can be safely ignored.
 
+cat > UU/usethreads.cbu <<'EOCBU'
 # This script UU/usethreads.cbu will get 'called-back' by Configure 
 # after it has prompted the user for whether to use threads.
-cat > UU/usethreads.cbu <<'EOCBU'
 case "$usethreads" in
 $define|true|[yY]*)
         if [ "$xxOsRevMajor" -lt 10 ]; then
@@ -353,9 +353,9 @@ EOM
 esac
 EOCBU
 
-# This script UU/uselfs.cbu will get 'called-back' by Configure 
-# after it has prompted the user for whether to use 64 bits.
 cat > UU/uselfs.cbu <<'EOCBU'
+# This script UU/uselfs.cbu will get 'called-back' by Configure 
+# after it has prompted the user for whether to use large files.
 case "$uselargefiles" in
 ''|$define|true|[yY]*)
 	# there are largefile flags available via getconf(1)
diff --git a/hints/irix_6.sh b/hints/irix_6.sh
index e50ffb42fe..ec83ada217 100644
--- a/hints/irix_6.sh
+++ b/hints/irix_6.sh
@@ -186,9 +186,9 @@ set `echo X "$libswanted "|sed -e 's/ sun / /' -e 's/ crypt / /' -e 's/ bsd / /'
 shift
 libswanted="$*"
 
+cat > UU/usethreads.cbu <<'EOCBU'
 # This script UU/usethreads.cbu will get 'called-back' by Configure 
 # after it has prompted the user for whether to use threads.
-cat > UU/usethreads.cbu <<'EOCBU'
 case "$usethreads" in
 $define|true|[yY]*)
         if test ! -f ${TOOLROOT}/usr/include/pthread.h -o ! -f /usr/lib/libpthread.so; then
@@ -238,9 +238,9 @@ EOCBU
 
 # The -n32 makes off_t to be 8 bytes, so we should have largefileness.
 
-# This script UU/use64bitint.cbu will get 'called-back' by Configure 
-# after it has prompted the user for whether to use 64 bits.
 cat > UU/use64bitint.cbu <<'EOCBU'
+# This script UU/use64bitint.cbu will get 'called-back' by Configure 
+# after it has prompted the user for whether to use 64 bit integers.
 case "$use64bitint" in
 $define|true|[yY]*)
 	    case "`uname -r`" in
@@ -257,9 +257,9 @@ EOM
 esac
 EOCBU
 
-# This script UU/use64bitall.cbu will get 'called-back' by Configure 
-# after it has prompted the user for whether to use 64 bits.
 cat > UU/use64bitall.cbu <<'EOCBU'
+# This script UU/use64bitall.cbu will get 'called-back' by Configure 
+# after it has prompted the user for whether to be maximally 64-bitty.
 case "$use64bitall" in
 $define|true|[yY]*)
 	ccflags="`echo $ccflags|sed -e 's%-n32%%'` -64"
diff --git a/hints/solaris_2.sh b/hints/solaris_2.sh
index 3065f6aa7a..30b59dd0d8 100644
--- a/hints/solaris_2.sh
+++ b/hints/solaris_2.sh
@@ -285,9 +285,9 @@ rm -f core
 # XXX
 EOSH
 
+cat > UU/usethreads.cbu <<'EOCBU'
 # This script UU/usethreads.cbu will get 'called-back' by Configure 
 # after it has prompted the user for whether to use threads.
-cat > UU/usethreads.cbu <<'EOCBU'
 case "$usethreads" in
 $define|true|[yY]*)
         ccflags="-D_REENTRANT $ccflags"
@@ -333,9 +333,9 @@ EOM
 esac
 EOCBU
 
+cat > UU/useuselargefiles.cbu <<'EOCBU'
 # This script UU/useuselargefiles.cbu will get 'called-back' by Configure 
 # after it has prompted the user for whether to use large files.
-cat > UU/useuselargefiles.cbu <<'EOCBU'
 case "$uselargefiles" in
 ''|$define|true|[yY]*)
     ccflags="$ccflags `getconf LFS_CFLAGS 2>/dev/null`"
@@ -345,9 +345,9 @@ case "$uselargefiles" in
 esac
 EOCBU
 
-# This script UU/use64bitint.cbu will get 'called-back' by Configure 
-# after it has prompted the user for whether to use 64 bits.
 cat > UU/use64bitint.cbu <<'EOCBU'
+# This script UU/use64bitint.cbu will get 'called-back' by Configure 
+# after it has prompted the user for whether to use 64 bit integers.
 case "$use64bitint" in
 $define|true|[yY]*)
 	    case "`uname -r`" in
@@ -359,15 +359,13 @@ EOM
 		exit 1
 		;;
 	    esac
-	    # When a 64-bit cc becomes available $archname64
-	    # may need setting so that $archname gets it attached.
 	    ;;
 esac
 EOCBU
 
-# This script UU/use64bitint.cbu will get 'called-back' by Configure 
-# after it has prompted the user for whether to use 64 bits.
-cat > UU/use64bitint.cbu <<'EOCBU'
+cat > UU/use64bitall.cbu <<'EOCBU'
+# This script UU/use64bitall.cbu will get 'called-back' by Configure 
+# after it has prompted the user for whether to be maximally 64 bitty.
 case "$use64bitall" in
 $define|true|[yY]*)
 	    case "$cc -v 2>/dev/null" in