From 87a56d9da22fb904cbd667f4d3cef1071ffe5954 Mon Sep 17 00:00:00 2001 From: James Laird Date: Mon, 17 Oct 2005 16:38:38 -0500 Subject: [svn-r11573] Purpose: Bug fix Description: Changed configure.in to use an environment variable TR to set the path to the tr utility. Solution: There are two kind of tr on Solaris with slightly different syntax. HDF5's configure relies on the "standard" tr. Traditionally, HDF5ers have needed to make sure that the "right" tr was found before the wrong one in their path; now they can use an environment variable. Platforms tested: mir, shanti, sol Misc. update: Forgot to update release notes. Off to do that now. --- Makefile.in | 1 + c++/Makefile.in | 1 + c++/examples/Makefile.in | 1 + c++/src/Makefile.in | 1 + c++/test/Makefile.in | 1 + configure | 87 ++++++++++++++++++++++++-------------------- configure.in | 21 +++++++---- examples/Makefile.in | 1 + fortran/Makefile.in | 1 + fortran/examples/Makefile.in | 1 + fortran/src/Makefile.in | 1 + fortran/test/Makefile.in | 1 + fortran/testpar/Makefile.in | 1 + hl/Makefile.in | 1 + hl/c++/Makefile.in | 1 + hl/c++/src/Makefile.in | 1 + hl/c++/test/Makefile.in | 1 + hl/fortran/Makefile.in | 1 + hl/fortran/src/Makefile.in | 1 + hl/fortran/test/Makefile.in | 1 + hl/src/Makefile.in | 1 + hl/test/Makefile.in | 1 + hl/tools/gif2h5/Makefile.in | 1 + perform/Makefile.in | 1 + src/Makefile.in | 1 + test/Makefile.in | 1 + testpar/Makefile.in | 1 + tools/Makefile.in | 1 + tools/gifconv/Makefile.in | 1 + tools/h5diff/Makefile.in | 1 + tools/h5dump/Makefile.in | 1 + tools/h5import/Makefile.in | 1 + tools/h5jam/Makefile.in | 1 + tools/h5ls/Makefile.in | 1 + tools/h5repack/Makefile.in | 1 + tools/lib/Makefile.in | 1 + tools/misc/Makefile.in | 1 + 37 files changed, 96 insertions(+), 47 deletions(-) diff --git a/Makefile.in b/Makefile.in index 400dfca..2782187 100644 --- a/Makefile.in +++ b/Makefile.in @@ -237,6 +237,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/c++/Makefile.in b/c++/Makefile.in index 0e3166c..c4bdf38 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -207,6 +207,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index 49f6595..86ddd8e 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -199,6 +199,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index 1115927..8847ce5 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -241,6 +241,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 983819f..52a77a7 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -230,6 +230,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/configure b/configure index f016de8..10041e7 100755 --- a/configure +++ b/configure @@ -467,7 +467,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPPFLAGS H5_CFLAGS H5_CPPFLAGS H5_FFLAGS H5_CXXFLAGS HSIZET CC CFLAGS LDFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE HDF5_INTERFACES R_LARGE R_INTEGER HADDR_T HSIZE_T HSSIZE_T HID_T SIZE_T OBJECT_NAMELEN_DEFAULT_F F9XSUFFIXFLAG FSEARCH_DIRS FC FCFLAGS ac_ct_FC F9XMODFLAG F9XMODEXT FCLIBS CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP LT_STATIC_EXEC PERL AR FORTRAN_SHARED_CONDITIONAL_TRUE FORTRAN_SHARED_CONDITIONAL_FALSE CXX_SHARED_CONDITIONAL_TRUE CXX_SHARED_CONDITIONAL_FALSE EGREP LN_S ECHO ac_ct_AR RANLIB ac_ct_RANLIB CPP F77 FFLAGS ac_ct_F77 LIBTOOL AM_MAKEFLAGS USE_FILTER_DEFLATE USE_FILTER_SZIP BUILD_PDB2HDF BUILD_PDB2HDF_CONDITIONAL_TRUE BUILD_PDB2HDF_CONDITIONAL_FALSE PTHREAD DEBUG_PKG TRACE_API INSTRUMENT_LIBRARY PARALLEL RUNSERIAL RUNPARALLEL TESTPARALLEL ADD_PARALLEL_FILES MPE FILTERS USE_FILTER_SHUFFLE USE_FILTER_FLETCHER32 USE_FILTER_NBIT USE_FILTER_SCALEOFFSET H5_VERSION CONFIG_DATE CONFIG_USER CONFIG_MODE BYTESEX STATIC_SHARED CC_VERSION ROOT DYNAMIC_DIRS HL HL_FOR BUILD_ALL_CONDITIONAL_TRUE BUILD_ALL_CONDITIONAL_FALSE BUILD_CXX_CONDITIONAL_TRUE BUILD_CXX_CONDITIONAL_FALSE BUILD_PABLO_CONDITIONAL_TRUE BUILD_PABLO_CONDITIONAL_FALSE BUILD_PARALLEL_CONDITIONAL_TRUE BUILD_PARALLEL_CONDITIONAL_FALSE BUILD_FORTRAN_CONDITIONAL_TRUE BUILD_FORTRAN_CONDITIONAL_FALSE BUILD_HDF5_HL_CONDITIONAL_TRUE BUILD_HDF5_HL_CONDITIONAL_FALSE SEARCH SETX LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPPFLAGS H5_CFLAGS H5_CPPFLAGS H5_FFLAGS H5_CXXFLAGS TR HSIZET CC CFLAGS LDFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE HDF5_INTERFACES R_LARGE R_INTEGER HADDR_T HSIZE_T HSSIZE_T HID_T SIZE_T OBJECT_NAMELEN_DEFAULT_F F9XSUFFIXFLAG FSEARCH_DIRS FC FCFLAGS ac_ct_FC F9XMODFLAG F9XMODEXT FCLIBS CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP LT_STATIC_EXEC PERL AR FORTRAN_SHARED_CONDITIONAL_TRUE FORTRAN_SHARED_CONDITIONAL_FALSE CXX_SHARED_CONDITIONAL_TRUE CXX_SHARED_CONDITIONAL_FALSE EGREP LN_S ECHO ac_ct_AR RANLIB ac_ct_RANLIB CPP F77 FFLAGS ac_ct_F77 LIBTOOL AM_MAKEFLAGS USE_FILTER_DEFLATE USE_FILTER_SZIP BUILD_PDB2HDF BUILD_PDB2HDF_CONDITIONAL_TRUE BUILD_PDB2HDF_CONDITIONAL_FALSE PTHREAD DEBUG_PKG TRACE_API INSTRUMENT_LIBRARY PARALLEL RUNSERIAL RUNPARALLEL TESTPARALLEL ADD_PARALLEL_FILES MPE FILTERS USE_FILTER_SHUFFLE USE_FILTER_FLETCHER32 USE_FILTER_NBIT USE_FILTER_SCALEOFFSET H5_VERSION CONFIG_DATE CONFIG_USER CONFIG_MODE BYTESEX STATIC_SHARED CC_VERSION ROOT DYNAMIC_DIRS HL HL_FOR BUILD_ALL_CONDITIONAL_TRUE BUILD_ALL_CONDITIONAL_FALSE BUILD_CXX_CONDITIONAL_TRUE BUILD_CXX_CONDITIONAL_FALSE BUILD_PABLO_CONDITIONAL_TRUE BUILD_PABLO_CONDITIONAL_FALSE BUILD_PARALLEL_CONDITIONAL_TRUE BUILD_PARALLEL_CONDITIONAL_FALSE BUILD_FORTRAN_CONDITIONAL_TRUE BUILD_FORTRAN_CONDITIONAL_FALSE BUILD_HDF5_HL_CONDITIONAL_TRUE BUILD_HDF5_HL_CONDITIONAL_FALSE SEARCH SETX LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -2133,12 +2133,18 @@ set >&5 echo "$as_me:$LINENO: result: done" >&5 echo "${ECHO_T}done" >&6 + + +if test "X${TR}" = "X"; then + TR=tr +fi + echo "$as_me:$LINENO: checking if tr works" >&5 echo $ECHO_N "checking if tr works... $ECHO_C" >&6 -TR_TEST="`echo Test | tr 'a-z,' 'A-Z '`" -if test $TR_TEST != "TEST"; then - { { echo "$as_me:$LINENO: error: tr program doesn't work" >&5 -echo "$as_me: error: tr program doesn't work" >&2;} +TR_TEST="`echo Test | ${TR} 'a-z,' 'A-Z '`" +if test "X${TR_TEST}" != "XTEST"; then + { { echo "$as_me:$LINENO: error: tr program ${TR} doesn't work" >&5 +echo "$as_me: error: tr program ${TR} doesn't work" >&2;} { (exit 1); exit 1; }; } else echo "$as_me:$LINENO: result: yes" >&5 @@ -3524,7 +3530,7 @@ fi # Provide some information about the compiler. -echo "$as_me:3527:" \ +echo "$as_me:3533:" \ "checking for Fortran compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -3819,7 +3825,7 @@ _ACEOF # flags. ac_save_FFLAGS=$FCFLAGS FCFLAGS="$FCFLAGS $ac_verb" -(eval echo $as_me:3822: \"$ac_link\") >&5 +(eval echo $as_me:3828: \"$ac_link\") >&5 ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'` echo "$ac_fc_v_output" >&5 FCFLAGS=$ac_save_FFLAGS @@ -3897,7 +3903,7 @@ _ACEOF # flags. ac_save_FFLAGS=$FCFLAGS FCFLAGS="$FCFLAGS $ac_cv_prog_fc_v" -(eval echo $as_me:3900: \"$ac_link\") >&5 +(eval echo $as_me:3906: \"$ac_link\") >&5 ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'` echo "$ac_fc_v_output" >&5 FCFLAGS=$ac_save_FFLAGS @@ -6476,7 +6482,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6479 "configure"' > conftest.$ac_ext + echo '#line 6485 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7606,7 +7612,7 @@ fi # Provide some information about the compiler. -echo "$as_me:7609:" \ +echo "$as_me:7615:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -8675,11 +8681,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8678: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8684: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8682: \$? = $ac_status" >&5 + echo "$as_me:8688: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -8930,11 +8936,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8933: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8939: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8937: \$? = $ac_status" >&5 + echo "$as_me:8943: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -8990,11 +8996,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8993: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8999: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8997: \$? = $ac_status" >&5 + echo "$as_me:9003: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11262,7 +11268,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13605: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13603: \$? = $ac_status" >&5 + echo "$as_me:13609: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -13656,11 +13662,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13659: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13665: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13663: \$? = $ac_status" >&5 + echo "$as_me:13669: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15075,7 +15081,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:16037: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16035: \$? = $ac_status" >&5 + echo "$as_me:16041: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -16088,11 +16094,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16091: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16097: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16095: \$? = $ac_status" >&5 + echo "$as_me:16101: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18144,11 +18150,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18147: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18153: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18151: \$? = $ac_status" >&5 + echo "$as_me:18157: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -18399,11 +18405,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18402: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18408: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18406: \$? = $ac_status" >&5 + echo "$as_me:18412: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -18459,11 +18465,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18462: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18468: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18466: \$? = $ac_status" >&5 + echo "$as_me:18472: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -20731,7 +20737,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&6 esac if test -n "$DEBUG_PKG"; then - for pkg in `echo $DEBUG_PKG | tr 'a-z,' 'A-Z '`; do + for pkg in `echo $DEBUG_PKG | ${TR} 'a-z,' 'A-Z '`; do CPPFLAGS="$CPPFLAGS -DH5${pkg}_DEBUG" done fi @@ -48287,7 +48293,7 @@ echo $ECHO_N "checking for mpirun... $ECHO_C" >&6 if (echo $cmd | grep / >/dev/null); then path="`echo $cmd | sed 's/\(.*\)\/.*$/\1/'`" else - for path in `echo $PATH | tr : ' '`; do + for path in `echo $PATH | ${TR} : ' '`; do if test -x $path/$cmd; then break fi @@ -48317,7 +48323,7 @@ echo $ECHO_N "checking for mpirun_lam or mpirun... $ECHO_C" >&6 if (echo $cmd | grep / >/dev/null); then path="`echo $cmd | sed 's/\(.*\)\/.*$/\1/'`" else - for path in `echo $PATH | tr : ' '`; do + for path in `echo $PATH | ${TR} : ' '`; do if test -x $path/$cmd; then break fi @@ -50378,7 +50384,7 @@ echo "${ECHO_T}$FILTERS" >&6 esac if test -n "$FILTERS"; then - for filter in `echo $FILTERS | tr 'a-z,' 'A-Z '`; do + for filter in `echo $FILTERS | ${TR} 'a-z,' 'A-Z '`; do if test $filter = "SHUFFLE"; then cat >>confdefs.h <<\_ACEOF @@ -52279,6 +52285,7 @@ s,@H5_CFLAGS@,$H5_CFLAGS,;t t s,@H5_CPPFLAGS@,$H5_CPPFLAGS,;t t s,@H5_FFLAGS@,$H5_FFLAGS,;t t s,@H5_CXXFLAGS@,$H5_CXXFLAGS,;t t +s,@TR@,$TR,;t t s,@HSIZET@,$HSIZET,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t diff --git a/configure.in b/configure.in index 2205f93..0573681 100644 --- a/configure.in +++ b/configure.in @@ -111,10 +111,17 @@ dnl that it actually does what it's supposed to do. Catch this early dnl since configure relies upon tr heavily and there's no use continuing dnl if it's broken. dnl + +dnl If the TR variable is set, use it as tr. +AC_SUBST([TR]) +if test "X${TR}" = "X"; then + TR=tr +fi + AC_MSG_CHECKING([if tr works]) -TR_TEST="`echo Test | tr 'a-z,' 'A-Z '`" -if test $TR_TEST != "TEST"; then - AC_MSG_ERROR([tr program doesn't work]) +TR_TEST="`echo Test | ${TR} 'a-z,' 'A-Z '`" +if test "X${TR_TEST}" != "XTEST"; then + AC_MSG_ERROR([tr program ${TR} doesn't work]) else AC_MSG_RESULT([yes]) fi @@ -1815,7 +1822,7 @@ case "X-$DEBUG_PKG" in esac if test -n "$DEBUG_PKG"; then - for pkg in `echo $DEBUG_PKG | tr 'a-z,' 'A-Z '`; do + for pkg in `echo $DEBUG_PKG | ${TR} 'a-z,' 'A-Z '`; do CPPFLAGS="$CPPFLAGS -DH5${pkg}_DEBUG" done fi @@ -1982,7 +1989,7 @@ case "$CC_BASENAME" in if (echo $cmd | grep / >/dev/null); then path="`echo $cmd | sed 's/\(.*\)\/.*$/\1/'`" else - for path in `echo $PATH | tr : ' '`; do + for path in `echo $PATH | ${TR} : ' '`; do if test -x $path/$cmd; then break fi @@ -2013,7 +2020,7 @@ case "$CC_BASENAME" in if (echo $cmd | grep / >/dev/null); then path="`echo $cmd | sed 's/\(.*\)\/.*$/\1/'`" else - for path in `echo $PATH | tr : ' '`; do + for path in `echo $PATH | ${TR} : ' '`; do if test -x $path/$cmd; then break fi @@ -2442,7 +2449,7 @@ case "X-$FILTERS" in esac if test -n "$FILTERS"; then - for filter in `echo $FILTERS | tr 'a-z,' 'A-Z '`; do + for filter in `echo $FILTERS | ${TR} 'a-z,' 'A-Z '`; do dnl ------------------------------------------------------------------ dnl Have to use separate 'if' construct for each filter, so that dnl autoheader can detect the AC_DEFINE for each one... diff --git a/examples/Makefile.in b/examples/Makefile.in index b97a3ff..a1503c1 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -199,6 +199,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/fortran/Makefile.in b/fortran/Makefile.in index 5878a78..a855395 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -211,6 +211,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index 262264d..ab1e450 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -199,6 +199,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index ee250df..db9ebbf 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -266,6 +266,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index b58b224..8f15484 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -260,6 +260,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index ef99905..df11135 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -223,6 +223,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/hl/Makefile.in b/hl/Makefile.in index f1b164c..84f2c99 100755 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -212,6 +212,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index 449be7b..b1917b7 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -208,6 +208,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index 68203d8..7a217d2 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -230,6 +230,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index 1b052c3..97a058d 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -224,6 +224,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index 636b8e3..8c7d237 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -212,6 +212,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 59e1e34..3a2afee 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -233,6 +233,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index 5e63bda..78c891d 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -232,6 +232,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index 3648814..0e8e285 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -231,6 +231,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index 93a1483..6a9072c 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -243,6 +243,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index 27ba2ba..de11fb7 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -231,6 +231,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/perform/Makefile.in b/perform/Makefile.in index bd12ef5..caff887 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -259,6 +259,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/src/Makefile.in b/src/Makefile.in index 299e85c..ccfe95d 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -267,6 +267,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/test/Makefile.in b/test/Makefile.in index f6f47b5..a157784 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -485,6 +485,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/testpar/Makefile.in b/testpar/Makefile.in index 2dd1648..0f7419a 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -233,6 +233,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/tools/Makefile.in b/tools/Makefile.in index c450c51..d478001 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -208,6 +208,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in index 27ba2ba..de11fb7 100644 --- a/tools/gifconv/Makefile.in +++ b/tools/gifconv/Makefile.in @@ -231,6 +231,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index 5044f21..93f3785 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -239,6 +239,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index 57cd4cc..34920f7 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -232,6 +232,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index ef9bc68..bdc2895 100755 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -232,6 +232,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index 29ff6b1..a2786b9 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -227,6 +227,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index 82de0e4..50c1634 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -225,6 +225,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index 2c7fdfb..3ab6915 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -247,6 +247,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index 6fb4015..4bc6685 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -229,6 +229,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index be41750..e53e281 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -256,6 +256,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@ -- cgit v0.12