[svn-r26728] Merge trunk reviwions 26669 and 26670.

Removed from configure.ac VPATH section, LONE_COLON check and checks for redundant addition of /usr/include and /usr/lib to compile flags, with reconfigure.

Tested h5committest
This commit is contained in:
Larry Knox
2015-04-04 10:27:14 -05:00
parent 2c3ab21057
commit 083ef61b05
44 changed files with 2 additions and 364 deletions

View File

@@ -21,8 +21,6 @@ TESTNAME=h5dumpxml
EXIT_SUCCESS=0
EXIT_FAILURE=1
H5_LONE_COLON="@H5_LONE_COLON@"
DUMPER=h5dump # The tool name
DUMPER_BIN=`pwd`/$DUMPER # The path of the tool binary
@@ -356,15 +354,7 @@ TOOLTEST tnamed_dtype_attr.h5.xml --xml tnamed_dtype_attr.h5
TOOLTEST tempty-dtd.h5.xml --xml --use-dtd tempty.h5
TOOLTEST tempty-dtd-2.h5.xml --xml -u tempty.h5
# The lone colon here confuses some systems (Cray X1). Skip
# it if configure detects that this is a problem.
if test "X$H5_LONE_COLON" != "Xno"; then
TOOLTEST tempty-nons.h5.xml --xml -X ":" tempty.h5
else
SKIP tempty-nons.h5.xml --xml -X ":" tempty.h5
fi
TOOLTEST tempty-nons.h5.xml --xml -X ":" tempty.h5
TOOLTEST tempty-nons-2.h5.xml --xml --xml-ns=":" tempty.h5
## Some of these combinations are syntactically correct but