From 530a55bbcdae9c20888dbed619444823f07b92ae Mon Sep 17 00:00:00 2001
From: Bill Wendling <wendling@ncsa.uiuc.edu>
Date: Mon, 24 Sep 2001 11:51:42 -0500
Subject: [svn-r4470] Purpose:     Bug Fix Description:     Some platforms
 which have a "Bourne" shell (/bin/sh) have ones which     don't support the
 "let" operator. Solution:     Had to remove my clever hack and replace with
 boring, old "echo -n"     statements instead. *sigh* Platforms tested:    
 Linux

---
 configure    | 46 +++++++++++++++++++---------------------------
 configure.in | 49 ++++++++++++++++++++++---------------------------
 2 files changed, 41 insertions(+), 54 deletions(-)

diff --git a/configure b/configure
index e195cac..68578ca 100755
--- a/configure
+++ b/configure
@@ -10228,14 +10228,6 @@ cat >> src/H5config.h <<EOF
 #endif
 EOF
 
-PRINT() {
-  SPACES="                                  "
-  msg="$SPACES $1:  "
-  msg_len="`echo \"$msg\" | wc -c | sed -e 's/ //g'`" 
-  let "begin_msg=$msg_len-34"
-  echo "$msg" | cut -c$begin_msg- | tr -d '\012'
-}
-
 IF_YES_NO() {
   if test "$1" = "yes"; then
     echo "Yes"
@@ -10255,7 +10247,7 @@ IF_ENABLED_DISABLED() {
 echo ""
 echo "Compiling Options:"
 
-PRINT "Compilation Mode"
+echo -n "               Compilation Mode:  "
 case "X-$enable_production" in
    X-yes)           echo "Production" ;;
    X-|X-no)         echo "Development" ;;
@@ -10263,7 +10255,7 @@ case "X-$enable_production" in
    *)               echo "$enable_production" ;;
 esac
 
-PRINT "Debug Mode"
+echo -n "                     Debug Mode:  "
 case "X-$DEBUG_PKG" in
   X-|X-yes)     echo "Default" ;;
   X-all)        echo "All" ;;
@@ -10271,16 +10263,16 @@ case "X-$DEBUG_PKG" in
   *)            echo "$DEBUG_PKG" ;;
 esac
 
-PRINT "Shared Libraries"
+echo -n "               Shared Libraries:  "
 IF_YES_NO "$enable_shared"
 
-PRINT "Static Libraries"
+echo -n "               Static Libraries:  "
 IF_YES_NO "$enable_static"
 
-PRINT "Statically Linked Executables"
+echo -n "  Statically Linked Executables:  "
 IF_YES_NO "$STATIC_EXEC"
 
-PRINT "Tracing"
+echo -n "                        Tracing:  "
 if test -z "$TRACE" -o "X$TRACE" = "Xyes"; then
   echo "Yes"
 else
@@ -10290,48 +10282,48 @@ fi
 echo ""
 echo "Features:"
 
-PRINT "C++"
+echo -n "                            C++:  "
 IF_YES_NO "$HDF_CXX"
 
-PRINT "Fortran"
+echo -n "                        Fortran:  "
 IF_YES_NO "$HDF_FORTRAN"
 
-PRINT "GASS"
+echo -n "                           GASS:  "
 IF_YES_NO "$GASS"
 
-PRINT "GridStorage"
+echo -n "                    GridStorage:  "
 IF_YES_NO "$GRIDSTORAGE"
 
-PRINT "HDF4"
+echo -n "                           HDF4:  "
 IF_YES_NO "$HAVE_HDF4"
 
-PRINT "HDF5 v1.4 Compatibility"
+echo -n "        HDF5 v1.4 Compatibility:  "
 IF_YES_NO "$HDF5_V1_4_COMPAT"
 
-PRINT "hsize_t"
+echo -n "                        hsize_t:  "
 case "$HSIZET" in
   no|small)  echo "Small" ;;
   *)         echo "Large" ;;
 esac
 
-PRINT "Linux Large File Support (LFS)"
+echo -n " Linux Large File Support (LFS):  "
 IF_ENABLED_DISABLED "$LINUX_LFS"
 
-PRINT "Parallel HDF5"
+echo -n "                  Parallel HDF5:  "
 if test "$PARALLEL" != "no"; then
   echo "Yes"
 else
   echo "No"
 fi
 
-PRINT "SRB"
+echo -n "                            SRB:  "
 IF_YES_NO "$SRB"
 
-PRINT "Stream VFD"
+echo -n "                     Stream VFD:  "
 IF_ENABLED_DISABLED "$STREAM_VFD"
 
-PRINT "Threadsafety"
+echo -n "                   Threadsafety:  "
 IF_ENABLED_DISABLED "$THREADSAFE"
 
-PRINT "Zlib-compression"
+echo -n "               Zlib-compression:  "
 IF_YES_NO "$HAVE_ZLIB"
diff --git a/configure.in b/configure.in
index c86f354..bcaaee7 100644
--- a/configure.in
+++ b/configure.in
@@ -1742,14 +1742,9 @@ cat >> src/H5config.h <<EOF
 #endif
 EOF
 
-PRINT() {
-  SPACES="                                  "
-  msg="$SPACES $1:  "
-  msg_len="`echo \"$msg\" | wc -c | sed -e 's/ //g'`" 
-  let "begin_msg=$msg_len-34"
-  echo "$msg" | cut -c$begin_msg- | tr -d '\012'
-}
-
+dnl ----------------------------------------------------------------------
+dnl Print out a summary of what we are going to build.
+dnl
 IF_YES_NO() {
   if test "$1" = "yes"; then
     echo "Yes"
@@ -1769,7 +1764,7 @@ IF_ENABLED_DISABLED() {
 echo ""
 echo "Compiling Options:"
 
-PRINT "Compilation Mode"
+echo -n "               Compilation Mode:  "
 case "X-$enable_production" in
    X-yes)           echo "Production" ;;
    X-|X-no)         echo "Development" ;;
@@ -1777,7 +1772,7 @@ case "X-$enable_production" in
    *)               echo "$enable_production" ;;
 esac
 
-PRINT "Debug Mode"
+echo -n "                     Debug Mode:  "
 case "X-$DEBUG_PKG" in
   X-|X-yes)     echo "Default" ;;
   X-all)        echo "All" ;;
@@ -1785,16 +1780,16 @@ case "X-$DEBUG_PKG" in
   *)            echo "$DEBUG_PKG" ;;
 esac
 
-PRINT "Shared Libraries"
+echo -n "               Shared Libraries:  "
 IF_YES_NO "$enable_shared"
 
-PRINT "Static Libraries"
+echo -n "               Static Libraries:  "
 IF_YES_NO "$enable_static"
 
-PRINT "Statically Linked Executables"
+echo -n "  Statically Linked Executables:  "
 IF_YES_NO "$STATIC_EXEC"
 
-PRINT "Tracing"
+echo -n "                        Tracing:  "
 if test -z "$TRACE" -o "X$TRACE" = "Xyes"; then
   echo "Yes"
 else
@@ -1804,48 +1799,48 @@ fi
 echo ""
 echo "Features:"
 
-PRINT "C++"
+echo -n "                            C++:  "
 IF_YES_NO "$HDF_CXX"
 
-PRINT "Fortran"
+echo -n "                        Fortran:  "
 IF_YES_NO "$HDF_FORTRAN"
 
-PRINT "GASS"
+echo -n "                           GASS:  "
 IF_YES_NO "$GASS"
 
-PRINT "GridStorage"
+echo -n "                    GridStorage:  "
 IF_YES_NO "$GRIDSTORAGE"
 
-PRINT "HDF4"
+echo -n "                           HDF4:  "
 IF_YES_NO "$HAVE_HDF4"
 
-PRINT "HDF5 v1.4 Compatibility"
+echo -n "        HDF5 v1.4 Compatibility:  "
 IF_YES_NO "$HDF5_V1_4_COMPAT"
 
-PRINT "hsize_t"
+echo -n "                        hsize_t:  "
 case "$HSIZET" in
   no|small)  echo "Small" ;;
   *)         echo "Large" ;;
 esac
 
-PRINT "Linux Large File Support (LFS)"
+echo -n " Linux Large File Support (LFS):  "
 IF_ENABLED_DISABLED "$LINUX_LFS"
 
-PRINT "Parallel HDF5"
+echo -n "                  Parallel HDF5:  "
 if test "$PARALLEL" != "no"; then
   echo "Yes"
 else
   echo "No"
 fi
 
-PRINT "SRB"
+echo -n "                            SRB:  "
 IF_YES_NO "$SRB"
 
-PRINT "Stream VFD"
+echo -n "                     Stream VFD:  "
 IF_ENABLED_DISABLED "$STREAM_VFD"
 
-PRINT "Threadsafety"
+echo -n "                   Threadsafety:  "
 IF_ENABLED_DISABLED "$THREADSAFE"
 
-PRINT "Zlib-compression"
+echo -n "               Zlib-compression:  "
 IF_YES_NO "$HAVE_ZLIB"
-- 
cgit v0.12