mirror of
https://github.com/HDFGroup/hdf5.git
synced 2024-11-27 02:10:55 +08:00
[svn-r26670] Remove VPATH and LONE_COLON
Tested with h5committest
This commit is contained in:
Larry Knox
parent
11413003c2
commit
306775bc98
101
configure.ac
101
configure.ac
@ -752,79 +752,6 @@ case "X-$RPATH" in
|
||||
;;
|
||||
esac
|
||||
|
||||
## ----------------------------------------------------------------------
|
||||
## Sometimes makes think the `.PATH:' appearing before the first rule
|
||||
## with an action should override the `all' default target. So we have
|
||||
## to decide what the proper syntax is.
|
||||
##
|
||||
AC_MSG_CHECKING([how make searches directories])
|
||||
while true; do #for break
|
||||
## The most common method is `VPATH=DIR1 DIR2 ...'
|
||||
cat >maketest <<EOF
|
||||
VPATH=$srcdir/config $srcdir/src $srcdir/bin
|
||||
.c.o:
|
||||
cp $< H5.o
|
||||
|
||||
foo: H5.o
|
||||
rm -f H5.o
|
||||
@echo works
|
||||
EOF
|
||||
|
||||
if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then
|
||||
SEARCH_RULE='VPATH='
|
||||
SEARCH_SEP=' '
|
||||
AC_MSG_RESULT([VPATH=DIR1 DIR2 ...])
|
||||
break
|
||||
fi
|
||||
|
||||
## The second most common method is like above except with the
|
||||
## directories separated by colons.
|
||||
cat >maketest <<EOF
|
||||
VPATH=$srcdir/config:$srcdir/src:$srcdir/bin
|
||||
.c.o:
|
||||
cp $< H5.o
|
||||
|
||||
foo: H5.o
|
||||
rm -f H5.o
|
||||
@echo works
|
||||
EOF
|
||||
|
||||
if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then
|
||||
SEARCH_RULE='VPATH='
|
||||
SEARCH_SEP=':'
|
||||
AC_MSG_RESULT([VPATH=DIR1:DIR2:...])
|
||||
break
|
||||
fi
|
||||
|
||||
## pmake uses the construct `.PATH: DIR1 DIR2
|
||||
cat >maketest <<EOF
|
||||
.PATH: $srcdir/config $srcdir/src $srcdir/bin
|
||||
.c.o:
|
||||
cp $< H5.o
|
||||
|
||||
foo: H5.o
|
||||
rm -f H5.o
|
||||
@echo works
|
||||
EOF
|
||||
|
||||
if (MAKE= ${MAKE-make} -f maketest foo) >/dev/null 2>&1; then
|
||||
SEARCH_RULE='.PATH: '
|
||||
SEARCH_SEP=' '
|
||||
AC_MSG_RESULT([.PATH: DIR1 DIR2 ...])
|
||||
break
|
||||
fi
|
||||
|
||||
## No way for make to search directories
|
||||
SEARCH_RULE='## SEARCH DISABLED: '
|
||||
SEARCH_SEP=' '
|
||||
AC_MSG_RESULT([it doesn't])
|
||||
if test ! -f configure; then
|
||||
AC_MSG_ERROR([${MAKE-make} requires the build and source directories to be the same])
|
||||
fi
|
||||
break
|
||||
done
|
||||
rm maketest
|
||||
|
||||
## ----------------------------------------------------------------------
|
||||
## pmake will throw an error if variables are undefined in a Makefile.
|
||||
## These errors can be changed to warnings using the -V flag.
|
||||
@ -1745,32 +1672,6 @@ AC_CHECK_FUNCS([signal longjmp setjmp siglongjmp sigsetjmp sigprocmask])
|
||||
AC_CHECK_FUNCS([snprintf srandom strdup symlink system])
|
||||
AC_CHECK_FUNCS([tmpfile asprintf vasprintf vsnprintf waitpid])
|
||||
|
||||
## ----------------------------------------------------------------------
|
||||
## Check that a lone colon can be used as an argument
|
||||
## This is not true on Cray X1, which interprets a lone colon as a
|
||||
## system command.
|
||||
##
|
||||
AC_CACHE_CHECK([if lone colon can be used as an argument],
|
||||
[hdf5_cv_lone_colon],
|
||||
[
|
||||
echo "int main(int argc, char * argv[]) {return 0;}" > conftest.c
|
||||
$CC $CFLAGS conftest.c -o a.out> /dev/null 2> /dev/null
|
||||
echo "./a.out :" > conftest.sh
|
||||
chmod 700 conftest.sh
|
||||
|
||||
./conftest.sh 2> conftest.out
|
||||
rm -f a.out
|
||||
TEST_OUTPUT=`cat conftest.out`
|
||||
|
||||
if test "X$TEST_OUTPUT" = "X"; then
|
||||
hdf5_cv_lone_colon=yes
|
||||
else
|
||||
hdf5_cv_lone_colon=no
|
||||
fi
|
||||
])
|
||||
|
||||
AC_SUBST([H5_LONE_COLON]) H5_LONE_COLON="$hdf5_cv_lone_colon"
|
||||
|
||||
## ----------------------------------------------------------------------
|
||||
## Check compiler characteristics
|
||||
##
|
||||
@ -2829,8 +2730,6 @@ AM_CONDITIONAL([BUILD_HDF5_HL_CONDITIONAL], [test "X$HDF5_HL" = "Xyes"])
|
||||
|
||||
## The directory search list
|
||||
AC_SUBST([SEARCH]) SEARCH='$(srcdir) $(top_builddir)/src $(top_srcdir)/src'
|
||||
cmd='echo $SEARCH |sed "s/ /'$SEARCH_SEP'/g"'
|
||||
SEARCH="$SEARCH_RULE`eval $cmd`"
|
||||
export SEARCH
|
||||
|
||||
## Some cleanup stuff
|
||||
|
||||
@ -411,14 +411,6 @@
|
||||
ADD_XML_H5_TEST (tempty-dtd.h5 0 --use-dtd tempty.h5)
|
||||
ADD_XML_H5_TEST (tempty-dtd-2.h5 0 -u tempty.h5)
|
||||
|
||||
# The lone colon here confuses some systems (Cray X1). Skip
|
||||
# it if configure detects that this is a problem.
|
||||
set (TESTTYPE "TEST")
|
||||
if (NOT ${H5_LONE_COLON})
|
||||
set (TESTTYPE "SKIP")
|
||||
endif (NOT ${H5_LONE_COLON})
|
||||
ADD_XML_SKIP_H5_TEST (tempty-nons.h5 0 ${TESTTYPE} -X : tempty.h5)
|
||||
|
||||
ADD_XML_H5_TEST (tempty-nons-2.h5 0 --xml-ns=: tempty.h5)
|
||||
|
||||
## Some of these combinations are syntactically correct but
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user