diff options
author | Albert Cheng <acheng@hdfgroup.org> | 2006-05-21 04:24:22 (GMT) |
---|---|---|
committer | Albert Cheng <acheng@hdfgroup.org> | 2006-05-21 04:24:22 (GMT) |
commit | 1f12eab01271cbea7f8ec156190aa60f6fee1918 (patch) | |
tree | d067b893e34ed798d2b751578be971aa66cff0e5 | |
parent | fb5ed749d0c4ea31a934cfc22211ad32b0c17e2f (diff) | |
download | hdf5-1f12eab01271cbea7f8ec156190aa60f6fee1918.zip hdf5-1f12eab01271cbea7f8ec156190aa60f6fee1918.tar.gz hdf5-1f12eab01271cbea7f8ec156190aa60f6fee1918.tar.bz2 |
[svn-r12360] Purpose:
Bug fix.
Description:
The ${TR}, though avoid the error, is inconvenient. It is needed
because configure.in use the char range in the style of 'a-z'.
The other style of '[a-z]' is more commonly accepted by all tr
but autoconf tends to strip away [], making the syntax rather
clumsy.
Solution:
Learned from autoconf that it avoids the use of character range
by just spell all the letters out. Changed our tr commands to
use those variables defined by autoconf. Also removed the
definition of ${TR} since it will cause inconsistancy when
autoconf also use plain 'tr' in its generated code.
The Makefile.in are changed because the elimination of ${TR} from
configure triggered its removal from all Makefil.in. That is okay
because ${TR} is not used at all in Makefile.
Platforms tested:
h5committested.
Misc. update:
Updated both INSTALL and RELEASE files.
-rwxr-xr-x | configure | 33 | ||||
-rw-r--r-- | configure.in | 28 | ||||
-rwxr-xr-x | fortran/configure | 3 | ||||
-rw-r--r-- | fortran/configure.in | 7 | ||||
-rw-r--r-- | release_docs/INSTALL | 4 | ||||
-rw-r--r-- | release_docs/RELEASE.txt | 2 |
6 files changed, 32 insertions, 45 deletions
@@ -473,7 +473,7 @@ ac_includes_default="\ # include <unistd.h> #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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPPFLAGS H5_CPPFLAGS H5_CFLAGS DEFAULT_LIBS TR HSIZET CC CFLAGS LDFLAGS ac_ct_CC EXEEXT OBJEXT config_dirs subdirs LT_STATIC_EXEC PERL AR SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP EGREP LIBTOOL USE_FILTER_DEFLATE USE_FILTER_SZIP SSL GASS TESTGASS SRB TESTSRB PTHREAD DEBUG_PKG TRACE_API INSTRUMENT_LIBRARY PARALLEL RUNSERIAL RUNPARALLEL TESTPARALLEL MPE FILTERS USE_FILTER_SHUFFLE USE_FILTER_FLETCHER32 H5_VERSION CONFIG_DATE CONFIG_USER CONFIG_MODE BYTESEX STATIC_SHARED CC_VERSION ROOT DYNAMIC_DIRS HL 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPPFLAGS H5_CPPFLAGS H5_CFLAGS DEFAULT_LIBS HSIZET CC CFLAGS LDFLAGS ac_ct_CC EXEEXT OBJEXT config_dirs subdirs LT_STATIC_EXEC PERL AR SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP EGREP LIBTOOL USE_FILTER_DEFLATE USE_FILTER_SZIP SSL GASS TESTGASS SRB TESTSRB PTHREAD DEBUG_PKG TRACE_API INSTRUMENT_LIBRARY PARALLEL RUNSERIAL RUNPARALLEL TESTPARALLEL MPE FILTERS USE_FILTER_SHUFFLE USE_FILTER_FLETCHER32 H5_VERSION CONFIG_DATE CONFIG_USER CONFIG_MODE BYTESEX STATIC_SHARED CC_VERSION ROOT DYNAMIC_DIRS HL SEARCH SETX LIBOBJS LTLIBOBJS' ac_subst_files='DEPEND COMMENCE CONCLUDE' # Initialize some variables set by options. @@ -1638,21 +1638,7 @@ set >&5 echo "$as_me:$LINENO: result: done" >&5 echo "${ECHO_T}done" >&6 -echo "$as_me:$LINENO: checking if tr works" >&5 -echo $ECHO_N "checking if tr works... $ECHO_C" >&6 -if test "X${TR}" = "X"; then - TR=tr -fi -TR_TEST="`echo Test | ${TR} 'a-z,' 'A-Z '`" -if test "X${TR_TEST}" != "XTEST"; then - { { echo "$as_me:$LINENO: error: tr program doesn't work" >&5 -echo "$as_me: error: tr program doesn't work" >&2;} - { (exit 1); exit 1; }; } -else - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -fi echo "$as_me:$LINENO: checking if basename works" >&5 echo $ECHO_N "checking if basename works... $ECHO_C" >&6 @@ -4576,7 +4562,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 4579 "configure"' > conftest.$ac_ext + echo '#line 4565 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5143,7 +5129,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:5146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:5132: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then @@ -7054,7 +7040,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 7057 "configure" +#line 7043 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -7152,7 +7138,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 7155 "configure" +#line 7141 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -34297,7 +34283,7 @@ echo "${ECHO_T}$DEBUG_PKG" >&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 ${as_cr_letters}',' ${as_cr_LETTERS}' '`; do CPPFLAGS="$CPPFLAGS -DH5${pkg}_DEBUG" done fi @@ -34471,7 +34457,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 @@ -34501,7 +34487,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 @@ -36501,7 +36487,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 ${as_cr_letters}',' ${as_cr_LETTERS}' '`; do if test $filter = "SHUFFLE"; then cat >>confdefs.h <<\_ACEOF @@ -37398,7 +37384,6 @@ s,@CPPFLAGS@,$CPPFLAGS,;t t s,@H5_CPPFLAGS@,$H5_CPPFLAGS,;t t s,@H5_CFLAGS@,$H5_CFLAGS,;t t s,@DEFAULT_LIBS@,$DEFAULT_LIBS,;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 d5bd978..a32b542 100644 --- a/configure.in +++ b/configure.in @@ -80,22 +80,16 @@ set >&AS_MESSAGE_LOG_FD AC_MSG_RESULT([done]) dnl ---------------------------------------------------------------------- -dnl Some platforms have broken tr, basename, and/or xargs programs. Check +dnl Some platforms have broken basename, and/or xargs programs. Check 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 since configure relies upon them heavily and there's no use continuing dnl if it's broken. dnl -AC_MSG_CHECKING([if tr works]) -AC_SUBST(TR) -if test "X${TR}" = "X"; then - TR=tr -fi -TR_TEST="`echo Test | ${TR} 'a-z,' 'A-Z '`" -if test "X${TR_TEST}" != "XTEST"; then - AC_MSG_ERROR([tr program doesn't work]) -else - AC_MSG_RESULT([yes]) -fi + +dnl Avoid depending upon Character Ranges. +dnl These are defined by autoconf. +dnl as_cr_letters='abcdefghijklmnopqrstuvwxyz' +dnl as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' AC_MSG_CHECKING([if basename works]) BASENAME_TEST="`basename /foo/bar/baz/qux/basename_works`" @@ -1629,7 +1623,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 ${as_cr_letters}',' ${as_cr_LETTERS}' '`; do CPPFLAGS="$CPPFLAGS -DH5${pkg}_DEBUG" done fi @@ -1796,7 +1790,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 @@ -1827,7 +1821,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 @@ -2165,7 +2159,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 ${as_cr_letters}',' ${as_cr_LETTERS}' '`; 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/fortran/configure b/fortran/configure index 201f714..319827b 100755 --- a/fortran/configure +++ b/fortran/configure @@ -9798,8 +9798,9 @@ 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 ${as_cr_letters}',' ${as_cr_LETTERS}' '`; do if test $filter = "SHUFFLE"; then cat >>confdefs.h <<\_ACEOF diff --git a/fortran/configure.in b/fortran/configure.in index 9f14fa3..fe1e6bf 100644 --- a/fortran/configure.in +++ b/fortran/configure.in @@ -743,8 +743,13 @@ case "X-$FILTERS" in ;; esac +dnl Avoid depending upon Character Ranges. +dnl These are defined by autoconf. +dnl as_cr_letters='abcdefghijklmnopqrstuvwxyz' +dnl as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' + if test -n "$FILTERS"; then - for filter in `echo $FILTERS | tr 'a-z,' 'A-Z '`; do + for filter in `echo $FILTERS | tr ${as_cr_letters}',' ${as_cr_LETTERS}' '`; do dnl ---------------------------------------------------------------------- dnl Have to use separate 'if' construct for each filter, so that autoheader dnl can detect the AC_DEFINE for each one... diff --git a/release_docs/INSTALL b/release_docs/INSTALL index 24d5f27..3c50956 100644 --- a/release_docs/INSTALL +++ b/release_docs/INSTALL @@ -334,8 +334,8 @@ $ MAKE=gmake ./configure $ gmake - The `AR', 'TR', and `RANLIB' variables can also be set to the names - of the `ar', 'tr', and `ranlib' (or `:') commands to override values + The `AR' and `RANLIB' variables can also be set to the names of + the `ar' and `ranlib' (or `:') commands to override values detected by configure. The HDF5 library, include files, and utilities are installed diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 2e0666f..c44a62c 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -78,6 +78,8 @@ Bug Fixes since HDF5-1.6.5 Release Configuration ------------- + - Configure can now use any tr command. No more need for + defining variable TR nor is it supported. -AKC 2006/05/20 Performance ------------- |