diff options
author | James Laird <jlaird@hdfgroup.org> | 2007-01-25 15:30:53 (GMT) |
---|---|---|
committer | James Laird <jlaird@hdfgroup.org> | 2007-01-25 15:30:53 (GMT) |
commit | 73b8819a42503e55c5c82fa478bdc2870b709deb (patch) | |
tree | fb086ce6a9dcd275c3df3f63a21dd0d21723a87a | |
parent | 8cf22df741e227437e9eb3228cb1f0bb6ba9dc1e (diff) | |
download | hdf5-73b8819a42503e55c5c82fa478bdc2870b709deb.zip hdf5-73b8819a42503e55c5c82fa478bdc2870b709deb.tar.gz hdf5-73b8819a42503e55c5c82fa478bdc2870b709deb.tar.bz2 |
[svn-r13198] Fiddled with the syntax of the configure test for srcdir="foo", which should
hopefully fix problems on copper and duty.
Tested on copper, duty, kagiso, Cygwin.
-rwxr-xr-x | configure | 61 | ||||
-rw-r--r-- | configure.in | 6 |
2 files changed, 32 insertions, 35 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 13184 2007-01-23 23:57:33Z acheng . +# From configure.in Id: configure.in 13195 2007-01-25 08:35:44Z hdftest . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.60 for HDF5 1.8.0-alpha5snap1. # @@ -7192,9 +7192,8 @@ echo $ECHO_N "checking if srcdir= and time commands work together... $ECHO_C" >& TIME=time -${TIME} echo 'baz' >& temp.out -TIME_TEST=`grep ^baz temp.out` -rm temp.out +TIME_TEST=`foo="bar" ${TIME} echo 'baz' 2> /dev/null | grep baz` + if test "X${TIME_TEST}" = "Xbaz"; then { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } @@ -8148,7 +8147,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 8151 "configure"' > conftest.$ac_ext + echo '#line 8150 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -10572,11 +10571,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:10575: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10574: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10579: \$? = $ac_status" >&5 + echo "$as_me:10578: \$? = $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 @@ -10827,11 +10826,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:10830: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10829: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10834: \$? = $ac_status" >&5 + echo "$as_me:10833: \$? = $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 @@ -10887,11 +10886,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:10890: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10889: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10894: \$? = $ac_status" >&5 + echo "$as_me:10893: \$? = $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 @@ -13266,7 +13265,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 13269 "configure" +#line 13268 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13364,7 +13363,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 13367 "configure" +#line 13366 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15628,11 +15627,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:15631: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15630: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15635: \$? = $ac_status" >&5 + echo "$as_me:15634: \$? = $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 @@ -15688,11 +15687,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:15691: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15690: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15695: \$? = $ac_status" >&5 + echo "$as_me:15694: \$? = $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 @@ -17186,7 +17185,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 17189 "configure" +#line 17188 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -17284,7 +17283,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 17287 "configure" +#line 17286 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18139,11 +18138,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:18142: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18141: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18146: \$? = $ac_status" >&5 + echo "$as_me:18145: \$? = $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 @@ -18199,11 +18198,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:18202: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18201: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18206: \$? = $ac_status" >&5 + echo "$as_me:18205: \$? = $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 @@ -20282,11 +20281,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:20285: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20284: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:20289: \$? = $ac_status" >&5 + echo "$as_me:20288: \$? = $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 @@ -20537,11 +20536,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:20540: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20539: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:20544: \$? = $ac_status" >&5 + echo "$as_me:20543: \$? = $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 @@ -20597,11 +20596,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:20600: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20599: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:20604: \$? = $ac_status" >&5 + echo "$as_me:20603: \$? = $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 @@ -22976,7 +22975,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 22979 "configure" +#line 22978 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -23074,7 +23073,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 23077 "configure" +#line 23076 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/configure.in b/configure.in index 07f1dc2..8f89116 100644 --- a/configure.in +++ b/configure.in @@ -530,10 +530,8 @@ AC_MSG_CHECKING([if srcdir= and time commands work together]) AC_SUBST([TIME]) TIME=time -dnl TIME_TEST=`foo="bar" ${TIME} echo 'baz' | grep ^baz` -${TIME} echo 'baz' >& temp.out -TIME_TEST=`grep ^baz temp.out` -rm temp.out +TIME_TEST=`foo="bar" ${TIME} echo 'baz' 2> /dev/null | grep baz` + if test "X${TIME_TEST}" = "Xbaz"; then AC_MSG_RESULT([yes]) else |