summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Wendling <wendling@ncsa.uiuc.edu>2001-09-28 20:31:17 (GMT)
committerBill Wendling <wendling@ncsa.uiuc.edu>2001-09-28 20:31:17 (GMT)
commitcb317bf9275d528fd34dc6793031dfd956dabf25 (patch)
tree4e6875052a8ec2003df83f0f6bece0ae9df01027
parent938be578415512b31d8ceec35dd69547232b5164 (diff)
downloadhdf5-cb317bf9275d528fd34dc6793031dfd956dabf25.zip
hdf5-cb317bf9275d528fd34dc6793031dfd956dabf25.tar.gz
hdf5-cb317bf9275d528fd34dc6793031dfd956dabf25.tar.bz2
[svn-r4497]
Purpose: Final Fantasy...er...fix Description: I fixed the problem with the summary printing newlines when we didn't want it to when using "ksh". Solution: There's a flag '\c' which should be used at the end of the line if you can't use the '-n' flag. Platforms tested: linux and modi4.
-rwxr-xr-xconfigure48
-rw-r--r--configure.in48
2 files changed, 52 insertions, 44 deletions
diff --git a/configure b/configure
index 2be3dd1..1966138 100755
--- a/configure
+++ b/configure
@@ -10334,22 +10334,26 @@ IF_ENABLED_DISABLED() {
fi
}
-if test -z "$ECHO_N"; then
+if test -z "$ECHO_N" -o -z "$ECHO_C"; then
if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
- ECHO_N=
+ ECHO_N=''
+ ECHO_C='
+'
else
ECHO_N=-n
+ ECHO_C=''
fi
else
- ECHO_N=
+ ECHO_N=''
+ ECHO_C='\c'
fi
fi
echo ""
echo "Compiling Options:"
-echo $ECHO_N " Compilation Mode: "
+echo $ECHO_N " Compilation Mode: $ECHO_C"
case "X-$enable_production" in
X-yes) echo "Production" ;;
X-|X-no) echo "Development" ;;
@@ -10357,7 +10361,7 @@ case "X-$enable_production" in
*) echo "$enable_production" ;;
esac
-echo $ECHO_N " Debug Mode: "
+echo $ECHO_N " Debug Mode: $ECHO_C"
case "X-$DEBUG_PKG" in
X-|X-yes) echo "Default" ;;
X-all) echo "All" ;;
@@ -10365,16 +10369,16 @@ case "X-$DEBUG_PKG" in
*) echo "$DEBUG_PKG" ;;
esac
-echo $ECHO_N " Shared Libraries: "
+echo $ECHO_N " Shared Libraries: $ECHO_C"
IF_YES_NO "$enable_shared"
-echo $ECHO_N " Static Libraries: "
+echo $ECHO_N " Static Libraries: $ECHO_C"
IF_YES_NO "$enable_static"
-echo $ECHO_N " Statically Linked Executables: "
+echo $ECHO_N " Statically Linked Executables: $ECHO_C"
IF_YES_NO "$STATIC_EXEC"
-echo $ECHO_N " Tracing: "
+echo $ECHO_N " Tracing: $ECHO_C"
if test -z "$TRACE" -o "X$TRACE" = "Xyes"; then
echo "Yes"
else
@@ -10384,48 +10388,48 @@ fi
echo ""
echo "Features:"
-echo $ECHO_N " C++: "
+echo $ECHO_N " C++: $ECHO_C"
IF_YES_NO "$HDF_CXX"
-echo $ECHO_N " Fortran: "
+echo $ECHO_N " Fortran: $ECHO_C"
IF_YES_NO "$HDF_FORTRAN"
-echo $ECHO_N " GASS: "
+echo $ECHO_N " GASS: $ECHO_C"
IF_YES_NO "$GASS"
-echo $ECHO_N " GridStorage: "
+echo $ECHO_N " GridStorage: $ECHO_C"
IF_YES_NO "$GRIDSTORAGE"
-echo $ECHO_N " HDF4: "
+echo $ECHO_N " HDF4: $ECHO_C"
IF_YES_NO "$HAVE_HDF4"
-echo $ECHO_N " HDF5 v1.4 Compatibility: "
+echo $ECHO_N " HDF5 v1.4 Compatibility: $ECHO_C"
IF_YES_NO "$HDF5_V1_4_COMPAT"
-echo $ECHO_N " hsize_t: "
+echo $ECHO_N " hsize_t: $ECHO_C"
case "$HSIZET" in
no|small) echo "Small" ;;
*) echo "Large" ;;
esac
-echo $ECHO_N " Linux Large File Support (LFS): "
+echo $ECHO_N " Linux Large File Support (LFS): $ECHO_C"
IF_ENABLED_DISABLED "$LINUX_LFS"
-echo $ECHO_N " Parallel HDF5: "
+echo $ECHO_N " Parallel HDF5: $ECHO_C"
if test "$PARALLEL" != "no"; then
echo "Yes"
else
echo "No"
fi
-echo $ECHO_N " SRB: "
+echo $ECHO_N " SRB: $ECHO_C"
IF_YES_NO "$SRB"
-echo $ECHO_N " Stream VFD: "
+echo $ECHO_N " Stream VFD: $ECHO_C"
IF_ENABLED_DISABLED "$STREAM_VFD"
-echo $ECHO_N " Threadsafety: "
+echo $ECHO_N " Threadsafety: $ECHO_C"
IF_ENABLED_DISABLED "$THREADSAFE"
-echo $ECHO_N " Zlib-compression: "
+echo $ECHO_N " Zlib-compression: $ECHO_C"
IF_YES_NO "$HAVE_ZLIB"
diff --git a/configure.in b/configure.in
index a0e8fe9..3992891 100644
--- a/configure.in
+++ b/configure.in
@@ -1826,22 +1826,26 @@ IF_ENABLED_DISABLED() {
fi
}
-if test -z "$ECHO_N"; then
+if test -z "$ECHO_N" -o -z "$ECHO_C"; then
if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
- ECHO_N=
+ ECHO_N=''
+ ECHO_C='
+'
else
ECHO_N=-n
+ ECHO_C=''
fi
else
- ECHO_N=
+ ECHO_N=''
+ ECHO_C='\c'
fi
fi
echo ""
echo "Compiling Options:"
-echo $ECHO_N " Compilation Mode: "
+echo $ECHO_N " Compilation Mode: $ECHO_C"
case "X-$enable_production" in
X-yes) echo "Production" ;;
X-|X-no) echo "Development" ;;
@@ -1849,7 +1853,7 @@ case "X-$enable_production" in
*) echo "$enable_production" ;;
esac
-echo $ECHO_N " Debug Mode: "
+echo $ECHO_N " Debug Mode: $ECHO_C"
case "X-$DEBUG_PKG" in
X-|X-yes) echo "Default" ;;
X-all) echo "All" ;;
@@ -1857,16 +1861,16 @@ case "X-$DEBUG_PKG" in
*) echo "$DEBUG_PKG" ;;
esac
-echo $ECHO_N " Shared Libraries: "
+echo $ECHO_N " Shared Libraries: $ECHO_C"
IF_YES_NO "$enable_shared"
-echo $ECHO_N " Static Libraries: "
+echo $ECHO_N " Static Libraries: $ECHO_C"
IF_YES_NO "$enable_static"
-echo $ECHO_N " Statically Linked Executables: "
+echo $ECHO_N " Statically Linked Executables: $ECHO_C"
IF_YES_NO "$STATIC_EXEC"
-echo $ECHO_N " Tracing: "
+echo $ECHO_N " Tracing: $ECHO_C"
if test -z "$TRACE" -o "X$TRACE" = "Xyes"; then
echo "Yes"
else
@@ -1876,48 +1880,48 @@ fi
echo ""
echo "Features:"
-echo $ECHO_N " C++: "
+echo $ECHO_N " C++: $ECHO_C"
IF_YES_NO "$HDF_CXX"
-echo $ECHO_N " Fortran: "
+echo $ECHO_N " Fortran: $ECHO_C"
IF_YES_NO "$HDF_FORTRAN"
-echo $ECHO_N " GASS: "
+echo $ECHO_N " GASS: $ECHO_C"
IF_YES_NO "$GASS"
-echo $ECHO_N " GridStorage: "
+echo $ECHO_N " GridStorage: $ECHO_C"
IF_YES_NO "$GRIDSTORAGE"
-echo $ECHO_N " HDF4: "
+echo $ECHO_N " HDF4: $ECHO_C"
IF_YES_NO "$HAVE_HDF4"
-echo $ECHO_N " HDF5 v1.4 Compatibility: "
+echo $ECHO_N " HDF5 v1.4 Compatibility: $ECHO_C"
IF_YES_NO "$HDF5_V1_4_COMPAT"
-echo $ECHO_N " hsize_t: "
+echo $ECHO_N " hsize_t: $ECHO_C"
case "$HSIZET" in
no|small) echo "Small" ;;
*) echo "Large" ;;
esac
-echo $ECHO_N " Linux Large File Support (LFS): "
+echo $ECHO_N " Linux Large File Support (LFS): $ECHO_C"
IF_ENABLED_DISABLED "$LINUX_LFS"
-echo $ECHO_N " Parallel HDF5: "
+echo $ECHO_N " Parallel HDF5: $ECHO_C"
if test "$PARALLEL" != "no"; then
echo "Yes"
else
echo "No"
fi
-echo $ECHO_N " SRB: "
+echo $ECHO_N " SRB: $ECHO_C"
IF_YES_NO "$SRB"
-echo $ECHO_N " Stream VFD: "
+echo $ECHO_N " Stream VFD: $ECHO_C"
IF_ENABLED_DISABLED "$STREAM_VFD"
-echo $ECHO_N " Threadsafety: "
+echo $ECHO_N " Threadsafety: $ECHO_C"
IF_ENABLED_DISABLED "$THREADSAFE"
-echo $ECHO_N " Zlib-compression: "
+echo $ECHO_N " Zlib-compression: $ECHO_C"
IF_YES_NO "$HAVE_ZLIB"