diff options
| -rwxr-xr-x | configure | 2268 | ||||
| -rw-r--r-- | configure.in | 1297 |
2 files changed, 1752 insertions, 1813 deletions
@@ -1,24 +1,6 @@ #! /bin/sh # From configure.in Id: configure.in - - - - - - - - - - - - - - - - - - ## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*- ## Copyright (C) 1996-1998 Free Software Foundation, Inc. ## Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 @@ -670,7 +652,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:674: checking host system type" >&5 +echo "configure:656: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -693,12 +675,12 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking shell variables initial values""... $ac_c" 1>&6 -echo "configure:697: checking shell variables initial values" >&5 +echo "configure:679: checking shell variables initial values" >&5 set >&5 echo "$ac_t""done" 1>&6 echo $ac_n "checking for cached host""... $ac_c" 1>&6 -echo "configure:702: checking for cached host" >&5 +echo "configure:684: checking for cached host" >&5 if eval "test \"`echo '$''{'hdf5_cv_host'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -715,27 +697,27 @@ elif test $hdf5_cv_host != $host; then fi case $host_os in - aix4.*) - host_os_novers=aix4.x - ;; - freebsd*) - host_os_novers=freebsd - ;; - irix5.*) - host_os_novers=irix5.x - ;; - irix6.*) - host_os_novers=irix6.x - ;; - osf4.*) - host_os_novers=osf4.x - ;; - solaris2.*) - host_os_novers=solaris2.x - ;; - *) - host_os_novers=$host_os - ;; + aix4.*) + host_os_novers=aix4.x + ;; + freebsd*) + host_os_novers=freebsd + ;; + irix5.*) + host_os_novers=irix5.x + ;; + irix6.*) + host_os_novers=irix6.x + ;; + osf4.*) + host_os_novers=osf4.x + ;; + solaris2.*) + host_os_novers=solaris2.x + ;; + *) + host_os_novers=$host_os + ;; esac host_config="none" @@ -751,7 +733,7 @@ for f in $host_cpu-$host_vendor-$host_os \ $host_vendor \ $host_cpu ; do echo $ac_n "checking for config $f""... $ac_c" 1>&6 -echo "configure:755: checking for config $f" >&5 +echo "configure:737: checking for config $f" >&5 if test -f $srcdir/config/$f; then host_config=$srcdir/config/$f echo "$ac_t""found" 1>&6 @@ -767,7 +749,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:771: checking for $ac_word" >&5 +echo "configure:753: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -797,7 +779,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:801: checking for $ac_word" >&5 +echo "configure:783: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -848,7 +830,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:852: checking for $ac_word" >&5 +echo "configure:834: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -880,7 +862,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:884: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:866: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -891,12 +873,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 895 "configure" +#line 877 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -922,12 +904,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:926: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:908: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:931: checking whether we are using GNU C" >&5 +echo "configure:913: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -936,7 +918,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:940: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -955,7 +937,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:959: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:941: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -991,7 +973,7 @@ CC_BASENAME="`echo $CC |cut -f1 -d' ' |xargs basename 2>/dev/null`" config_dirs="" echo $ac_n "checking if fortran interface enabled""... $ac_c" 1>&6 -echo "configure:995: checking if fortran interface enabled" >&5 +echo "configure:977: checking if fortran interface enabled" >&5 # Check whether --enable-fortran or --disable-fortran was given. if test "${enable_fortran+set}" = set; then enableval="$enable_fortran" @@ -999,20 +981,19 @@ if test "${enable_fortran+set}" = set; then fi -if test "X$HDF_FORTRAN" = Xyes; then +if test "X$HDF_FORTRAN" = "Xyes"; then echo "yes" - if test -z $config_dirs; then - config_dirs=fortran + config_dirs=fortran else - config_dirs=${config_dirs} fortran + config_dirs=${config_dirs} fortran fi else echo "no" fi echo $ac_n "checking if c++ interface enabled""... $ac_c" 1>&6 -echo "configure:1016: checking if c++ interface enabled" >&5 +echo "configure:997: checking if c++ interface enabled" >&5 # Check whether --enable-c++ or --disable-c++ was given. if test "${enable_c+++set}" = set; then enableval="$enable_c++" @@ -1020,13 +1001,12 @@ if test "${enable_c+++set}" = set; then fi -if test "X$HDF_CXX" = Xyes; then +if test "X$HDF_CXX" = "Xyes"; then echo "yes" - if test -z $config_dirs; then - config_dirs=c++ + config_dirs=c++ else - config_dirs=${config_dirs} c++ + config_dirs=${config_dirs} c++ fi else echo "no" @@ -1036,7 +1016,7 @@ subdirs="${config_dirs}" echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1040: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1020: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1074,7 +1054,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1078: checking for a BSD compatible install" >&5 +echo "configure:1058: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1175,7 +1155,7 @@ fi # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1179: checking for $ac_word" >&5 +echo "configure:1159: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1215,7 +1195,7 @@ ac_prog=ld if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1219: checking for ld used by GCC" >&5 +echo "configure:1199: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -1233,10 +1213,10 @@ echo "configure:1219: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1237: checking for GNU ld" >&5 +echo "configure:1217: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1240: checking for non-GNU ld" >&5 +echo "configure:1220: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1272,7 +1252,7 @@ fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1276: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1256: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1288,7 +1268,7 @@ echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1292: checking for BSD-compatible nm" >&5 +echo "configure:1272: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1325,7 +1305,7 @@ echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1329: checking whether ln -s works" >&5 +echo "configure:1309: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1361,8 +1341,8 @@ test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld" case "$host" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 1365 "configure"' > conftest.$ac_ext - if { (eval echo configure:1366: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 1345 "configure"' > conftest.$ac_ext + if { (eval echo configure:1346: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -1393,7 +1373,7 @@ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ echo $ac_n "checking if should build only statically linked executables""... $ac_c" 1>&6 -echo "configure:1397: checking if should build only statically linked executables" >&5 +echo "configure:1377: checking if should build only statically linked executables" >&5 # Check whether --enable-static_exec or --disable-static_exec was given. if test "${enable_static_exec+set}" = set; then enableval="$enable_static_exec" @@ -1401,7 +1381,7 @@ if test "${enable_static_exec+set}" = set; then fi -if test "X$STATIC_EXEC" = Xyes; then +if test "X$STATIC_EXEC" = "Xyes"; then echo "yes" LT_STATIC_EXEC="-all-static" else @@ -1410,14 +1390,13 @@ else fi - if test "X$AR" = "X"; then for ac_prog in ar xar do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1421: checking for $ac_word" >&5 +echo "configure:1400: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1451,58 +1430,57 @@ fi echo $ac_n "checking make""... $ac_c" 1>&6 -echo "configure:1455: checking make" >&5 +echo "configure:1434: checking make" >&5 if test "`${MAKE-make} --version -f /dev/null 2>/dev/null |\ - sed -n 1p|cut -c1-8`" = "GNU Make"; then - echo "$ac_t""GNU make" 1>&6 - GMAKE=yes - if test "X$GCC" = "Xyes"; then - DEPEND=config/depend1 - else - DEPEND=config/depend2 - fi + sed -n 1p|cut -c1-8`" = "GNU Make"; then + echo "$ac_t""GNU make" 1>&6 + GMAKE=yes + if test "X$GCC" = "Xyes"; then + DEPEND=config/depend1 + else + DEPEND=config/depend2 + fi else - echo "$ac_t""generic" 1>&6 + echo "$ac_t""generic" 1>&6 fi -if test "X" = "X$DEPEND"; then - echo $ac_n "checking how to include a makefile""... $ac_c" 1>&6 -echo "configure:1472: checking how to include a makefile" >&5 +if test -z "$DEPEND"; then + echo $ac_n "checking how to include a makefile""... $ac_c" 1>&6 +echo "configure:1451: checking how to include a makefile" >&5 - cat >makeinc <<EOF + cat >makeinc <<EOF foo: @: EOF - while true; do #for break - - echo '.include <makeinc>' >maketest - if (MAKE= ${MAKE-make} -f maketest foo) >/dev/null 2>&1; then - echo "$ac_t"".include <FILE>" 1>&6 - DEPEND=config/depend3 - break - fi + while true; do #for break + echo '.include <makeinc>' >maketest + if (MAKE= ${MAKE-make} -f maketest foo) >/dev/null 2>&1; then + echo "$ac_t"".include <FILE>" 1>&6 + DEPEND=config/depend3 + break + fi - echo 'include makeinc' >maketest - if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then - echo "$ac_t""include FILE" 1>&6 - DEPEND=config/depend4 - break; - fi + echo 'include makeinc' >maketest + if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then + echo "$ac_t""include FILE" 1>&6 + DEPEND=config/depend4 + break; + fi - echo "$ac_t""you have a deficient make command" 1>&6 - DEPEND=config/dependN - break - done - rm makeinc maketest + echo "$ac_t""you have a deficient make command" 1>&6 + DEPEND=config/dependN + break + done + rm makeinc maketest fi echo $ac_n "checking how make searches directories""... $ac_c" 1>&6 -echo "configure:1503: checking how make searches directories" >&5 +echo "configure:1481: checking how make searches directories" >&5 while true; do #for break - # The most common method is `VPATH=DIR1 DIR2 ...' - cat >maketest <<EOF + # The most common method is `VPATH=DIR1 DIR2 ...' + cat >maketest <<EOF VPATH=$srcdir/config $srcdir/src $srcdir/bin .c.o: cp $< H5.o @@ -1511,16 +1489,14 @@ foo: H5.o /bin/rm -f H5.o @echo works EOF - if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then - SEARCH_RULE='VPATH=' - SEARCH_SEP=' ' - echo "$ac_t""VPATH=DIR1 DIR2 ..." 1>&6 - break - fi + if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then + SEARCH_RULE='VPATH=' + SEARCH_SEP=' ' + echo "$ac_t""VPATH=DIR1 DIR2 ..." 1>&6 + break + fi - # The second most common method is like above except with the - # directories separated by colons. - cat >maketest <<EOF + cat >maketest <<EOF VPATH=$srcdir/config:$srcdir/src:$srcdir/bin .c.o: cp $< H5.o @@ -1529,15 +1505,14 @@ foo: H5.o /bin/rm -f H5.o @echo works EOF - if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then - SEARCH_RULE='VPATH=' - SEARCH_SEP=':' - echo "$ac_t""VPATH=DIR1:DIR2:..." 1>&6 - break - fi + if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then + SEARCH_RULE='VPATH=' + SEARCH_SEP=':' + echo "$ac_t""VPATH=DIR1:DIR2:..." 1>&6 + break + fi - # pmake uses the construct `.PATH: DIR1 DIR2 - cat >maketest <<EOF + cat >maketest <<EOF .PATH: $srcdir/config $srcdir/src $srcdir/bin .c.o: cp $< H5.o @@ -1546,30 +1521,29 @@ foo: H5.o /bin/rm -f H5.o @echo works EOF - if (MAKE= ${MAKE-make} -f maketest foo) >/dev/null 2>&1; then - SEARCH_RULE='.PATH: ' - SEARCH_SEP=' ' - echo "$ac_t"".PATH: DIR1 DIR2 ..." 1>&6 - break - fi + if (MAKE= ${MAKE-make} -f maketest foo) >/dev/null 2>&1; then + SEARCH_RULE='.PATH: ' + SEARCH_SEP=' ' + echo "$ac_t"".PATH: DIR1 DIR2 ..." 1>&6 + break + fi - # No way for make to search directories - SEARCH_RULE='## SEARCH DISABLED: ' - SEARCH_SEP=' ' - echo "$ac_t""it doesn't" 1>&6 - if test ! -f configure; then - { echo "configure: error: ${MAKE-make} requires the build and source directories to be the same" 1>&2; exit 1; } - fi - break + SEARCH_RULE='## SEARCH DISABLED: ' + SEARCH_SEP=' ' + echo "$ac_t""it doesn't" 1>&6 + if test ! -f configure; then + { echo "configure: error: ${MAKE-make} requires the build and source directories to be the same" 1>&2; exit 1; } + fi + break done rm maketest -if test Xyes = "X$GCC"; then +if test "X$GCC" = "Xyes"; then CFLAGS="$CFLAGS -Wall -W -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline" fi echo $ac_n "checking for production mode""... $ac_c" 1>&6 -echo "configure:1573: checking for production mode" >&5 +echo "configure:1547: checking for production mode" >&5 # Check whether --enable-production or --disable-production was given. if test "${enable_production+set}" = set; then enableval="$enable_production" @@ -1603,7 +1577,7 @@ case "X-$enable_production" in esac echo $ac_n "checking for ceil in -lm""... $ac_c" 1>&6 -echo "configure:1607: checking for ceil in -lm" >&5 +echo "configure:1581: checking for ceil in -lm" >&5 ac_lib_var=`echo m'_'ceil | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1611,7 +1585,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 1615 "configure" +#line 1589 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1622,7 +1596,7 @@ int main() { ceil() ; return 0; } EOF -if { (eval echo configure:1626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1650,7 +1624,7 @@ else fi echo $ac_n "checking for xdr_int in -lnsl""... $ac_c" 1>&6 -echo "configure:1654: checking for xdr_int in -lnsl" >&5 +echo "configure:1628: checking for xdr_int in -lnsl" >&5 ac_lib_var=`echo nsl'_'xdr_int | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1658,7 +1632,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 1662 "configure" +#line 1636 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1669,7 +1643,7 @@ int main() { xdr_int() ; return 0; } EOF -if { (eval echo configure:1673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1697,7 +1671,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1701: checking how to run the C preprocessor" >&5 +echo "configure:1675: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1712,13 +1686,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1716 "configure" +#line 1690 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1722: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1696: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1729,13 +1703,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1733 "configure" +#line 1707 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1739: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1746,13 +1720,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1750 "configure" +#line 1724 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1756: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1730: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1777,12 +1751,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1781: checking for ANSI C header files" >&5 +echo "configure:1755: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1786 "configure" +#line 1760 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1790,7 +1764,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1794: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1768: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1807,7 +1781,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1811 "configure" +#line 1785 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1825,7 +1799,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1829 "configure" +#line 1803 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1846,7 +1820,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 1850 "configure" +#line 1824 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1857,7 +1831,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1881,12 +1855,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:1885: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:1859: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1890 "configure" +#line 1864 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -1895,7 +1869,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -1919,17 +1893,17 @@ for ac_hdr in sys/resource.h sys/time.h unistd.h sys/ioctl.h sys/stat.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1923: checking for $ac_hdr" >&5 +echo "configure:1897: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1928 "configure" +#line 1902 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1933: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1907: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1959,17 +1933,17 @@ for ac_hdr in stddef.h setjmp.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1963: checking for $ac_hdr" >&5 +echo "configure:1937: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1968 "configure" +#line 1942 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1973: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1999,17 +1973,17 @@ for ac_hdr in stdint.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2003: checking for $ac_hdr" >&5 +echo "configure:1977: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2008 "configure" +#line 1982 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2013: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1987: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2039,17 +2013,17 @@ for ac_hdr in io.h winsock.h sys/timeb.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2043: checking for $ac_hdr" >&5 +echo "configure:2017: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2048 "configure" +#line 2022 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2053: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2076,23 +2050,23 @@ fi done -case $host in - alpha*-dec*-osf*) - for ac_hdr in sys/sysinfo.h sys/proc.h +case "$host" in + alpha*-dec*-osf*) + for ac_hdr in sys/sysinfo.h sys/proc.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2086: checking for $ac_hdr" >&5 +echo "configure:2060: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2091 "configure" +#line 2065 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2096: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2118,16 +2092,16 @@ else fi done - ;; + ;; esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:2126: checking for off_t" >&5 +echo "configure:2100: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2131 "configure" +#line 2105 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2155,12 +2129,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2159: checking for size_t" >&5 +echo "configure:2133: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2164 "configure" +#line 2138 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2188,12 +2162,12 @@ EOF fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:2192: checking for ssize_t" >&5 +echo "configure:2166: checking for ssize_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2197 "configure" +#line 2171 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2221,14 +2195,14 @@ EOF fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:2225: checking whether byte ordering is bigendian" >&5 +echo "configure:2199: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext <<EOF -#line 2232 "configure" +#line 2206 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -2239,11 +2213,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:2243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2217: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext <<EOF -#line 2247 "configure" +#line 2221 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -2254,7 +2228,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:2258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2232: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -2274,7 +2248,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 2278 "configure" +#line 2252 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -2287,7 +2261,7 @@ main () { exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:2291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -2311,7 +2285,7 @@ EOF fi echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:2315: checking size of char" >&5 +echo "configure:2289: checking size of char" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2319,7 +2293,7 @@ else ac_cv_sizeof_char=1 else cat > conftest.$ac_ext <<EOF -#line 2323 "configure" +#line 2297 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2330,7 +2304,7 @@ main() exit(0); } EOF -if { (eval echo configure:2334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_char=`cat conftestval` else @@ -2350,7 +2324,7 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:2354: checking size of short" >&5 +echo "configure:2328: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2358,7 +2332,7 @@ else ac_cv_sizeof_short=2 else cat > conftest.$ac_ext <<EOF -#line 2362 "configure" +#line 2336 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2369,7 +2343,7 @@ main() exit(0); } EOF -if { (eval echo configure:2373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else @@ -2389,7 +2363,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:2393: checking size of int" >&5 +echo "configure:2367: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2397,7 +2371,7 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext <<EOF -#line 2401 "configure" +#line 2375 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2408,7 +2382,7 @@ main() exit(0); } EOF -if { (eval echo configure:2412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -2428,7 +2402,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:2432: checking size of long" >&5 +echo "configure:2406: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2436,7 +2410,7 @@ else ac_cv_sizeof_long=4 else cat > conftest.$ac_ext <<EOF -#line 2440 "configure" +#line 2414 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2447,7 +2421,7 @@ main() exit(0); } EOF -if { (eval echo configure:2451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -2467,7 +2441,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:2471: checking size of long long" >&5 +echo "configure:2445: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2475,7 +2449,7 @@ else ac_cv_sizeof_long_long=8 else cat > conftest.$ac_ext <<EOF -#line 2479 "configure" +#line 2453 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2486,7 +2460,7 @@ main() exit(0); } EOF -if { (eval echo configure:2490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -2506,7 +2480,7 @@ EOF echo $ac_n "checking size of __int64""... $ac_c" 1>&6 -echo "configure:2510: checking size of __int64" >&5 +echo "configure:2484: checking size of __int64" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof___int64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2514,7 +2488,7 @@ else ac_cv_sizeof___int64=8 else cat > conftest.$ac_ext <<EOF -#line 2518 "configure" +#line 2492 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2525,7 +2499,7 @@ main() exit(0); } EOF -if { (eval echo configure:2529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof___int64=`cat conftestval` else @@ -2545,7 +2519,7 @@ EOF echo $ac_n "checking size of float""... $ac_c" 1>&6 -echo "configure:2549: checking size of float" >&5 +echo "configure:2523: checking size of float" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_float'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2553,7 +2527,7 @@ else ac_cv_sizeof_float=4 else cat > conftest.$ac_ext <<EOF -#line 2557 "configure" +#line 2531 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2564,7 +2538,7 @@ main() exit(0); } EOF -if { (eval echo configure:2568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_float=`cat conftestval` else @@ -2584,7 +2558,7 @@ EOF echo $ac_n "checking size of double""... $ac_c" 1>&6 -echo "configure:2588: checking size of double" >&5 +echo "configure:2562: checking size of double" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2592,7 +2566,7 @@ else ac_cv_sizeof_double=8 else cat > conftest.$ac_ext <<EOF -#line 2596 "configure" +#line 2570 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2603,7 +2577,7 @@ main() exit(0); } EOF -if { (eval echo configure:2607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_double=`cat conftestval` else @@ -2623,7 +2597,7 @@ EOF echo $ac_n "checking size of long double""... $ac_c" 1>&6 -echo "configure:2627: checking size of long double" >&5 +echo "configure:2601: checking size of long double" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2631,7 +2605,7 @@ else ac_cv_sizeof_long_double=8 else cat > conftest.$ac_ext <<EOF -#line 2635 "configure" +#line 2609 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2642,7 +2616,7 @@ main() exit(0); } EOF -if { (eval echo configure:2646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_double=`cat conftestval` else @@ -2713,14 +2687,15 @@ rm -f confcache cat >>confdefs.h <<\EOF #include <sys/types.h> EOF -if test "Xyes" = "X$C9x"; then - cat >>confdefs.h <<\EOF + +if test "X$C9x" = "Xyes"; then + cat >>confdefs.h <<\EOF #include <stdint.h> EOF fi echo $ac_n "checking size of int8_t""... $ac_c" 1>&6 -echo "configure:2724: checking size of int8_t" >&5 +echo "configure:2699: checking size of int8_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int8_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2728,7 +2703,7 @@ else ac_cv_sizeof_int8_t=1 else cat > conftest.$ac_ext <<EOF -#line 2732 "configure" +#line 2707 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2739,7 +2714,7 @@ main() exit(0); } EOF -if { (eval echo configure:2743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int8_t=`cat conftestval` else @@ -2759,7 +2734,7 @@ EOF echo $ac_n "checking size of uint8_t""... $ac_c" 1>&6 -echo "configure:2763: checking size of uint8_t" >&5 +echo "configure:2738: checking size of uint8_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint8_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2767,7 +2742,7 @@ else ac_cv_sizeof_uint8_t=1 else cat > conftest.$ac_ext <<EOF -#line 2771 "configure" +#line 2746 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2778,7 +2753,7 @@ main() exit(0); } EOF -if { (eval echo configure:2782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint8_t=`cat conftestval` else @@ -2798,7 +2773,7 @@ EOF echo $ac_n "checking size of int_least8_t""... $ac_c" 1>&6 -echo "configure:2802: checking size of int_least8_t" >&5 +echo "configure:2777: checking size of int_least8_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int_least8_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2806,7 +2781,7 @@ else ac_cv_sizeof_int_least8_t=1 else cat > conftest.$ac_ext <<EOF -#line 2810 "configure" +#line 2785 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2817,7 +2792,7 @@ main() exit(0); } EOF -if { (eval echo configure:2821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int_least8_t=`cat conftestval` else @@ -2837,7 +2812,7 @@ EOF echo $ac_n "checking size of uint_least8_t""... $ac_c" 1>&6 -echo "configure:2841: checking size of uint_least8_t" >&5 +echo "configure:2816: checking size of uint_least8_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint_least8_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2845,7 +2820,7 @@ else ac_cv_sizeof_uint_least8_t=1 else cat > conftest.$ac_ext <<EOF -#line 2849 "configure" +#line 2824 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2856,7 +2831,7 @@ main() exit(0); } EOF -if { (eval echo configure:2860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint_least8_t=`cat conftestval` else @@ -2876,7 +2851,7 @@ EOF echo $ac_n "checking size of int_fast8_t""... $ac_c" 1>&6 -echo "configure:2880: checking size of int_fast8_t" >&5 +echo "configure:2855: checking size of int_fast8_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int_fast8_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2884,7 +2859,7 @@ else ac_cv_sizeof_int_fast8_t=1 else cat > conftest.$ac_ext <<EOF -#line 2888 "configure" +#line 2863 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2895,7 +2870,7 @@ main() exit(0); } EOF -if { (eval echo configure:2899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int_fast8_t=`cat conftestval` else @@ -2915,7 +2890,7 @@ EOF echo $ac_n "checking size of uint_fast8_t""... $ac_c" 1>&6 -echo "configure:2919: checking size of uint_fast8_t" >&5 +echo "configure:2894: checking size of uint_fast8_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint_fast8_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2923,7 +2898,7 @@ else ac_cv_sizeof_uint_fast8_t=1 else cat > conftest.$ac_ext <<EOF -#line 2927 "configure" +#line 2902 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2934,7 +2909,7 @@ main() exit(0); } EOF -if { (eval echo configure:2938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint_fast8_t=`cat conftestval` else @@ -2955,7 +2930,7 @@ EOF echo $ac_n "checking size of int16_t""... $ac_c" 1>&6 -echo "configure:2959: checking size of int16_t" >&5 +echo "configure:2934: checking size of int16_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2963,7 +2938,7 @@ else ac_cv_sizeof_int16_t=2 else cat > conftest.$ac_ext <<EOF -#line 2967 "configure" +#line 2942 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2974,7 +2949,7 @@ main() exit(0); } EOF -if { (eval echo configure:2978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int16_t=`cat conftestval` else @@ -2994,7 +2969,7 @@ EOF echo $ac_n "checking size of uint16_t""... $ac_c" 1>&6 -echo "configure:2998: checking size of uint16_t" >&5 +echo "configure:2973: checking size of uint16_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3002,7 +2977,7 @@ else ac_cv_sizeof_uint16_t=2 else cat > conftest.$ac_ext <<EOF -#line 3006 "configure" +#line 2981 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3013,7 +2988,7 @@ main() exit(0); } EOF -if { (eval echo configure:3017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint16_t=`cat conftestval` else @@ -3033,7 +3008,7 @@ EOF echo $ac_n "checking size of int_least16_t""... $ac_c" 1>&6 -echo "configure:3037: checking size of int_least16_t" >&5 +echo "configure:3012: checking size of int_least16_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int_least16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3041,7 +3016,7 @@ else ac_cv_sizeof_int_least16_t=2 else cat > conftest.$ac_ext <<EOF -#line 3045 "configure" +#line 3020 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3052,7 +3027,7 @@ main() exit(0); } EOF -if { (eval echo configure:3056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int_least16_t=`cat conftestval` else @@ -3072,7 +3047,7 @@ EOF echo $ac_n "checking size of uint_least16_t""... $ac_c" 1>&6 -echo "configure:3076: checking size of uint_least16_t" >&5 +echo "configure:3051: checking size of uint_least16_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint_least16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3080,7 +3055,7 @@ else ac_cv_sizeof_uint_least16_t=2 else cat > conftest.$ac_ext <<EOF -#line 3084 "configure" +#line 3059 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3091,7 +3066,7 @@ main() exit(0); } EOF -if { (eval echo configure:3095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint_least16_t=`cat conftestval` else @@ -3111,7 +3086,7 @@ EOF echo $ac_n "checking size of int_fast16_t""... $ac_c" 1>&6 -echo "configure:3115: checking size of int_fast16_t" >&5 +echo "configure:3090: checking size of int_fast16_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int_fast16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3119,7 +3094,7 @@ else ac_cv_sizeof_int_fast16_t=2 else cat > conftest.$ac_ext <<EOF -#line 3123 "configure" +#line 3098 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3130,7 +3105,7 @@ main() exit(0); } EOF -if { (eval echo configure:3134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int_fast16_t=`cat conftestval` else @@ -3150,7 +3125,7 @@ EOF echo $ac_n "checking size of uint_fast16_t""... $ac_c" 1>&6 -echo "configure:3154: checking size of uint_fast16_t" >&5 +echo "configure:3129: checking size of uint_fast16_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint_fast16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3158,7 +3133,7 @@ else ac_cv_sizeof_uint_fast16_t=2 else cat > conftest.$ac_ext <<EOF -#line 3162 "configure" +#line 3137 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3169,7 +3144,7 @@ main() exit(0); } EOF -if { (eval echo configure:3173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint_fast16_t=`cat conftestval` else @@ -3190,7 +3165,7 @@ EOF echo $ac_n "checking size of int32_t""... $ac_c" 1>&6 -echo "configure:3194: checking size of int32_t" >&5 +echo "configure:3169: checking size of int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3198,7 +3173,7 @@ else ac_cv_sizeof_int32_t=4 else cat > conftest.$ac_ext <<EOF -#line 3202 "configure" +#line 3177 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3209,7 +3184,7 @@ main() exit(0); } EOF -if { (eval echo configure:3213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int32_t=`cat conftestval` else @@ -3229,7 +3204,7 @@ EOF echo $ac_n "checking size of uint32_t""... $ac_c" 1>&6 -echo "configure:3233: checking size of uint32_t" >&5 +echo "configure:3208: checking size of uint32_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3237,7 +3212,7 @@ else ac_cv_sizeof_uint32_t=4 else cat > conftest.$ac_ext <<EOF -#line 3241 "configure" +#line 3216 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3248,7 +3223,7 @@ main() exit(0); } EOF -if { (eval echo configure:3252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint32_t=`cat conftestval` else @@ -3268,7 +3243,7 @@ EOF echo $ac_n "checking size of int_least32_t""... $ac_c" 1>&6 -echo "configure:3272: checking size of int_least32_t" >&5 +echo "configure:3247: checking size of int_least32_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int_least32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3276,7 +3251,7 @@ else ac_cv_sizeof_int_least32_t=4 else cat > conftest.$ac_ext <<EOF -#line 3280 "configure" +#line 3255 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3287,7 +3262,7 @@ main() exit(0); } EOF -if { (eval echo configure:3291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int_least32_t=`cat conftestval` else @@ -3307,7 +3282,7 @@ EOF echo $ac_n "checking size of uint_least32_t""... $ac_c" 1>&6 -echo "configure:3311: checking size of uint_least32_t" >&5 +echo "configure:3286: checking size of uint_least32_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint_least32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3315,7 +3290,7 @@ else ac_cv_sizeof_uint_least32_t=4 else cat > conftest.$ac_ext <<EOF -#line 3319 "configure" +#line 3294 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3326,7 +3301,7 @@ main() exit(0); } EOF -if { (eval echo configure:3330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint_least32_t=`cat conftestval` else @@ -3346,7 +3321,7 @@ EOF echo $ac_n "checking size of int_fast32_t""... $ac_c" 1>&6 -echo "configure:3350: checking size of int_fast32_t" >&5 +echo "configure:3325: checking size of int_fast32_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int_fast32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3354,7 +3329,7 @@ else ac_cv_sizeof_int_fast32_t=4 else cat > conftest.$ac_ext <<EOF -#line 3358 "configure" +#line 3333 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3365,7 +3340,7 @@ main() exit(0); } EOF -if { (eval echo configure:3369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int_fast32_t=`cat conftestval` else @@ -3385,7 +3360,7 @@ EOF echo $ac_n "checking size of uint_fast32_t""... $ac_c" 1>&6 -echo "configure:3389: checking size of uint_fast32_t" >&5 +echo "configure:3364: checking size of uint_fast32_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint_fast32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3393,7 +3368,7 @@ else ac_cv_sizeof_uint_fast32_t=4 else cat > conftest.$ac_ext <<EOF -#line 3397 "configure" +#line 3372 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3404,7 +3379,7 @@ main() exit(0); } EOF -if { (eval echo configure:3408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint_fast32_t=`cat conftestval` else @@ -3425,7 +3400,7 @@ EOF echo $ac_n "checking size of int64_t""... $ac_c" 1>&6 -echo "configure:3429: checking size of int64_t" >&5 +echo "configure:3404: checking size of int64_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3433,7 +3408,7 @@ else ac_cv_sizeof_int64_t=8 else cat > conftest.$ac_ext <<EOF -#line 3437 "configure" +#line 3412 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3444,7 +3419,7 @@ main() exit(0); } EOF -if { (eval echo configure:3448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int64_t=`cat conftestval` else @@ -3464,7 +3439,7 @@ EOF echo $ac_n "checking size of uint64_t""... $ac_c" 1>&6 -echo "configure:3468: checking size of uint64_t" >&5 +echo "configure:3443: checking size of uint64_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3472,7 +3447,7 @@ else ac_cv_sizeof_uint64_t=8 else cat > conftest.$ac_ext <<EOF -#line 3476 "configure" +#line 3451 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3483,7 +3458,7 @@ main() exit(0); } EOF -if { (eval echo configure:3487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint64_t=`cat conftestval` else @@ -3503,7 +3478,7 @@ EOF echo $ac_n "checking size of int_least64_t""... $ac_c" 1>&6 -echo "configure:3507: checking size of int_least64_t" >&5 +echo "configure:3482: checking size of int_least64_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int_least64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3511,7 +3486,7 @@ else ac_cv_sizeof_int_least64_t=8 else cat > conftest.$ac_ext <<EOF -#line 3515 "configure" +#line 3490 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3522,7 +3497,7 @@ main() exit(0); } EOF -if { (eval echo configure:3526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int_least64_t=`cat conftestval` else @@ -3542,7 +3517,7 @@ EOF echo $ac_n "checking size of uint_least64_t""... $ac_c" 1>&6 -echo "configure:3546: checking size of uint_least64_t" >&5 +echo "configure:3521: checking size of uint_least64_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint_least64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3550,7 +3525,7 @@ else ac_cv_sizeof_uint_least64_t=8 else cat > conftest.$ac_ext <<EOF -#line 3554 "configure" +#line 3529 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3561,7 +3536,7 @@ main() exit(0); } EOF -if { (eval echo configure:3565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint_least64_t=`cat conftestval` else @@ -3581,7 +3556,7 @@ EOF echo $ac_n "checking size of int_fast64_t""... $ac_c" 1>&6 -echo "configure:3585: checking size of int_fast64_t" >&5 +echo "configure:3560: checking size of int_fast64_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int_fast64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3589,7 +3564,7 @@ else ac_cv_sizeof_int_fast64_t=8 else cat > conftest.$ac_ext <<EOF -#line 3593 "configure" +#line 3568 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3600,7 +3575,7 @@ main() exit(0); } EOF -if { (eval echo configure:3604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int_fast64_t=`cat conftestval` else @@ -3620,7 +3595,7 @@ EOF echo $ac_n "checking size of uint_fast64_t""... $ac_c" 1>&6 -echo "configure:3624: checking size of uint_fast64_t" >&5 +echo "configure:3599: checking size of uint_fast64_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint_fast64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3628,7 +3603,7 @@ else ac_cv_sizeof_uint_fast64_t=8 else cat > conftest.$ac_ext <<EOF -#line 3632 "configure" +#line 3607 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3639,7 +3614,7 @@ main() exit(0); } EOF -if { (eval echo configure:3643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint_fast64_t=`cat conftestval` else @@ -3660,7 +3635,7 @@ EOF echo $ac_n "checking size of size_t""... $ac_c" 1>&6 -echo "configure:3664: checking size of size_t" >&5 +echo "configure:3639: checking size of size_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3668,7 +3643,7 @@ else ac_cv_sizeof_size_t=4 else cat > conftest.$ac_ext <<EOF -#line 3672 "configure" +#line 3647 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3679,7 +3654,7 @@ main() exit(0); } EOF -if { (eval echo configure:3683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_size_t=`cat conftestval` else @@ -3702,7 +3677,7 @@ cat >>confdefs.h <<\EOF #include <sys/types.h> /*for off_t definition*/ EOF echo $ac_n "checking size of off_t""... $ac_c" 1>&6 -echo "configure:3706: checking size of off_t" >&5 +echo "configure:3681: checking size of off_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3710,7 +3685,7 @@ else ac_cv_sizeof_off_t=4 else cat > conftest.$ac_ext <<EOF -#line 3714 "configure" +#line 3689 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3721,7 +3696,7 @@ main() exit(0); } EOF -if { (eval echo configure:3725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_off_t=`cat conftestval` else @@ -3747,22 +3722,23 @@ if test "${enable_hsizet+set}" = set; then HSIZET=$enableval fi + echo $ac_n "checking for sizeof hsize_t and hssize_t""... $ac_c" 1>&6 -echo "configure:3752: checking for sizeof hsize_t and hssize_t" >&5 +echo "configure:3728: checking for sizeof hsize_t and hssize_t" >&5 case $HSIZET in - no|small) - echo "$ac_t""small" 1>&6 - HSIZET=small - ;; - *) - echo "$ac_t""large" 1>&6 - HSIZET=large - cat >> confdefs.h <<\EOF + no|small) + echo "$ac_t""small" 1>&6 + HSIZET=small + ;; + *) + echo "$ac_t""large" 1>&6 + HSIZET=large + cat >> confdefs.h <<\EOF #define HAVE_LARGE_HSIZET 1 EOF - ;; + ;; esac cat > confcache <<\EOF @@ -3813,14 +3789,14 @@ fi rm -f confcache - -H5TOH4=h5toh4 - -TESTH5TOH4='$(srcdir)/testh5toh4' + H5TOH4=h5toh4 + TESTH5TOH4='$(srcdir)/testh5toh4' test -d /usr/ncsa/include && CPPFLAGS="$CPPFLAGS -I/usr/ncsa/include" test -d /usr/ncsa/lib && LDFLAGS="$LDFLAGS -L/usr/ncsa/lib" +FOUND_ZLIB="no" + # Check whether --with-hdf4 or --without-hdf4 was given. if test "${with_hdf4+set}" = set; then withval="$with_hdf4" @@ -3829,23 +3805,23 @@ else withval=yes fi -case $withval in - yes) - for ac_hdr in mfhdf.h +case "$withval" in + yes) + for ac_hdr in mfhdf.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3839: checking for $ac_hdr" >&5 +echo "configure:3815: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3844 "configure" +#line 3820 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3872,27 +3848,27 @@ unset H5TOH4 TESTH5TOH4 fi done - echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6 -echo "configure:3877: checking for deflate in -lz" >&5 -ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'` + echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6 +echo "configure:3853: checking for compress in -lz" >&5 +ac_lib_var=`echo z'_'compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 3885 "configure" +#line 3861 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char deflate(); +char compress(); int main() { -deflate() +compress() ; return 0; } EOF -if { (eval echo configure:3896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3907,21 +3883,14 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo z | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <<EOF -#define $ac_tr_lib 1 -EOF - - LIBS="-lz $LIBS" - + FOUND_ZLIB="yes" else echo "$ac_t""no" 1>&6 unset H5TOH4 TESTH5TOH4 fi - echo $ac_n "checking for jpeg_start_compress in -ljpeg""... $ac_c" 1>&6 -echo "configure:3925: checking for jpeg_start_compress in -ljpeg" >&5 + echo $ac_n "checking for jpeg_start_compress in -ljpeg""... $ac_c" 1>&6 +echo "configure:3894: checking for jpeg_start_compress in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_start_compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3929,7 +3898,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <<EOF -#line 3933 "configure" +#line 3902 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3940,7 +3909,7 @@ int main() { jpeg_start_compress() ; return 0; } EOF -if { (eval echo configure:3944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3968,8 +3937,8 @@ else unset H5TOH4 TESTH5TOH4 fi - echo $ac_n "checking for Hstartaccess in -ldf""... $ac_c" 1>&6 -echo "configure:3973: checking for Hstartaccess in -ldf" >&5 + echo $ac_n "checking for Hstartaccess in -ldf""... $ac_c" 1>&6 +echo "configure:3942: checking for Hstartaccess in -ldf" >&5 ac_lib_var=`echo df'_'Hstartaccess | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3977,7 +3946,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldf $LIBS" cat > conftest.$ac_ext <<EOF -#line 3981 "configure" +#line 3950 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3988,7 +3957,7 @@ int main() { Hstartaccess() ; return 0; } EOF -if { (eval echo configure:3992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4016,8 +3985,8 @@ else unset H5TOH4 TESTH5TOH4 fi - echo $ac_n "checking for SDstart in -lmfhdf""... $ac_c" 1>&6 -echo "configure:4021: checking for SDstart in -lmfhdf" >&5 + echo $ac_n "checking for SDstart in -lmfhdf""... $ac_c" 1>&6 +echo "configure:3990: checking for SDstart in -lmfhdf" >&5 ac_lib_var=`echo mfhdf'_'SDstart | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4025,7 +3994,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmfhdf $LIBS" cat > conftest.$ac_ext <<EOF -#line 4029 "configure" +#line 3998 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4036,7 +4005,7 @@ int main() { SDstart() ; return 0; } EOF -if { (eval echo configure:4040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4064,33 +4033,33 @@ else unset H5TOH4 TESTH5TOH4 fi - ;; - no) - echo $ac_n "checking for HDF4""... $ac_c" 1>&6 -echo "configure:4071: checking for HDF4" >&5 - echo "$ac_t""suppressed" 1>&6 - unset H5TOH4 TESTH5TOH4 - ;; - *) - hdf4_inc="`echo $withval |cut -f1 -d,`" - if test "X" != "$hdf4_inc"; then - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$hdf4_inc" - for ac_hdr in mfhdf.h + ;; + no) + echo $ac_n "checking for HDF4""... $ac_c" 1>&6 +echo "configure:4040: checking for HDF4" >&5 + echo "$ac_t""suppressed" 1>&6 + unset H5TOH4 TESTH5TOH4 + ;; + *) + hdf4_inc="`echo $withval |cut -f1 -d,`" + if test -n "$hdf4_inc"; then + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I$hdf4_inc" + for ac_hdr in mfhdf.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4084: checking for $ac_hdr" >&5 +echo "configure:4053: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4089 "configure" +#line 4058 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4094: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4063: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4114,27 +4083,26 @@ EOF else echo "$ac_t""no" 1>&6 CPPFLAGS="$saved_CPPFLAGS" - unset H5TOH4 TESTH5TOH4 - + unset H5TOH4 TESTH5TOH4 fi done - else - for ac_hdr in mfhdf.h + else + for ac_hdr in mfhdf.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4128: checking for $ac_hdr" >&5 +echo "configure:4096: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4133 "configure" +#line 4101 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4138: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4106: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4160,33 +4128,33 @@ else fi done - fi + fi - hdf4_lib="`echo $withval |cut -f2 -d, -s`" - if test "X" != "$hdf4_lib"; then - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$hdf4_lib" - echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6 -echo "configure:4171: checking for deflate in -lz" >&5 -ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'` + hdf4_lib="`echo $withval |cut -f2 -d, -s`" + if test -n "$hdf4_lib"; then + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$hdf4_lib" + echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6 +echo "configure:4139: checking for compress in -lz" >&5 +ac_lib_var=`echo z'_'compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 4179 "configure" +#line 4147 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char deflate(); +char compress(); int main() { -deflate() +compress() ; return 0; } EOF -if { (eval echo configure:4190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4201,21 +4169,14 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo z | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <<EOF -#define $ac_tr_lib 1 -EOF - - LIBS="-lz $LIBS" - + FOUND_ZLIB="yes" else echo "$ac_t""no" 1>&6 unset H5TOH4 TESTH5TOH4 fi - echo $ac_n "checking for jpeg_start_compress in -ljpeg""... $ac_c" 1>&6 -echo "configure:4219: checking for jpeg_start_compress in -ljpeg" >&5 + echo $ac_n "checking for jpeg_start_compress in -ljpeg""... $ac_c" 1>&6 +echo "configure:4180: checking for jpeg_start_compress in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_start_compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4223,7 +4184,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <<EOF -#line 4227 "configure" +#line 4188 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4234,7 +4195,7 @@ int main() { jpeg_start_compress() ; return 0; } EOF -if { (eval echo configure:4238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4262,8 +4223,8 @@ else unset H5TOH4 TESTH5TOH4 fi - echo $ac_n "checking for Hstartaccess in -ldf""... $ac_c" 1>&6 -echo "configure:4267: checking for Hstartaccess in -ldf" >&5 + echo $ac_n "checking for Hstartaccess in -ldf""... $ac_c" 1>&6 +echo "configure:4228: checking for Hstartaccess in -ldf" >&5 ac_lib_var=`echo df'_'Hstartaccess | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4271,7 +4232,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldf $LIBS" cat > conftest.$ac_ext <<EOF -#line 4275 "configure" +#line 4236 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4282,7 +4243,7 @@ int main() { Hstartaccess() ; return 0; } EOF -if { (eval echo configure:4286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4310,8 +4271,8 @@ else unset H5TOH4 TESTH5TOH4 fi - echo $ac_n "checking for SDstart in -lmfhdf""... $ac_c" 1>&6 -echo "configure:4315: checking for SDstart in -lmfhdf" >&5 + echo $ac_n "checking for SDstart in -lmfhdf""... $ac_c" 1>&6 +echo "configure:4276: checking for SDstart in -lmfhdf" >&5 ac_lib_var=`echo mfhdf'_'SDstart | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4319,7 +4280,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmfhdf $LIBS" cat > conftest.$ac_ext <<EOF -#line 4323 "configure" +#line 4284 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4330,7 +4291,7 @@ int main() { SDstart() ; return 0; } EOF -if { (eval echo configure:4334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4358,28 +4319,28 @@ else unset H5TOH4 TESTH5TOH4 fi - else - echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6 -echo "configure:4364: checking for deflate in -lz" >&5 -ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'` + else + echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6 +echo "configure:4325: checking for compress in -lz" >&5 +ac_lib_var=`echo z'_'compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 4372 "configure" +#line 4333 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char deflate(); +char compress(); int main() { -deflate() +compress() ; return 0; } EOF -if { (eval echo configure:4383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4394,21 +4355,14 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo z | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <<EOF -#define $ac_tr_lib 1 -EOF - - LIBS="-lz $LIBS" - + FOUND_ZLIB="yes" else echo "$ac_t""no" 1>&6 unset H5TOH4 TESTH5TOH4 fi - echo $ac_n "checking for jpeg_start_compress in -ljpeg""... $ac_c" 1>&6 -echo "configure:4412: checking for jpeg_start_compress in -ljpeg" >&5 + echo $ac_n "checking for jpeg_start_compress in -ljpeg""... $ac_c" 1>&6 +echo "configure:4366: checking for jpeg_start_compress in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_start_compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4416,7 +4370,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <<EOF -#line 4420 "configure" +#line 4374 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4427,7 +4381,7 @@ int main() { jpeg_start_compress() ; return 0; } EOF -if { (eval echo configure:4431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4455,8 +4409,8 @@ else unset H5TOH4 TESTH5TOH4 fi - echo $ac_n "checking for Hstartaccess in -ldf""... $ac_c" 1>&6 -echo "configure:4460: checking for Hstartaccess in -ldf" >&5 + echo $ac_n "checking for Hstartaccess in -ldf""... $ac_c" 1>&6 +echo "configure:4414: checking for Hstartaccess in -ldf" >&5 ac_lib_var=`echo df'_'Hstartaccess | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4464,7 +4418,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldf $LIBS" cat > conftest.$ac_ext <<EOF -#line 4468 "configure" +#line 4422 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4475,7 +4429,7 @@ int main() { Hstartaccess() ; return 0; } EOF -if { (eval echo configure:4479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4502,8 +4456,8 @@ else echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for SDstart in -lmfhdf""... $ac_c" 1>&6 -echo "configure:4507: checking for SDstart in -lmfhdf" >&5 + echo $ac_n "checking for SDstart in -lmfhdf""... $ac_c" 1>&6 +echo "configure:4461: checking for SDstart in -lmfhdf" >&5 ac_lib_var=`echo mfhdf'_'SDstart | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4511,7 +4465,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmfhdf $LIBS" cat > conftest.$ac_ext <<EOF -#line 4515 "configure" +#line 4469 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4522,7 +4476,7 @@ int main() { SDstart() ; return 0; } EOF -if { (eval echo configure:4526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4549,11 +4503,10 @@ else echo "$ac_t""no" 1>&6 fi - fi - ;; + fi + ;; esac - # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then withval="$with_zlib" @@ -4562,23 +4515,24 @@ else withval=yes fi -case $withval in - yes) - for ac_hdr in zlib.h +if test "X$FOUND_ZLIB" = "Xno"; then + case "$withval" in + yes) + for ac_hdr in zlib.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4572: checking for $ac_hdr" >&5 +echo "configure:4526: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4577 "configure" +#line 4531 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4582: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4536: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4604,8 +4558,8 @@ else fi done - echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6 -echo "configure:4609: checking for compress in -lz" >&5 + echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6 +echo "configure:4563: checking for compress in -lz" >&5 ac_lib_var=`echo z'_'compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4613,7 +4567,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 4617 "configure" +#line 4571 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4624,7 +4578,7 @@ int main() { compress() ; return 0; } EOF -if { (eval echo configure:4628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4651,32 +4605,32 @@ else echo "$ac_t""no" 1>&6 fi - ;; - no) - echo $ac_n "checking for GNU zlib""... $ac_c" 1>&6 -echo "configure:4658: checking for GNU zlib" >&5 - echo "$ac_t""suppressed" 1>&6 - ;; - *) - zlib_inc="`echo $withval |cut -f1 -d,`" - if test "X" != "$zlib_inc"; then - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$zlib_inc" - for ac_hdr in zlib.h + ;; + no) + echo $ac_n "checking for GNU zlib""... $ac_c" 1>&6 +echo "configure:4612: checking for GNU zlib" >&5 + echo "$ac_t""suppressed" 1>&6 + ;; + *) + zlib_inc="`echo $withval |cut -f1 -d,`" + if test -n "$zlib_inc"; then + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I$zlib_inc" + for ac_hdr in zlib.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4670: checking for $ac_hdr" >&5 +echo "configure:4624: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4675 "configure" +#line 4629 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4680: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4703,22 +4657,22 @@ CPPFLAGS="$saved_CPPFLAGS" fi done - else - for ac_hdr in zlib.h + else + for ac_hdr in zlib.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4712: checking for $ac_hdr" >&5 +echo "configure:4666: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4717 "configure" +#line 4671 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4722: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4676: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4744,14 +4698,14 @@ else fi done - fi - - zlib_lib="`echo $withval |cut -f2 -d, -s`" - if test "X" != "$zlib_lib"; then - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$zlib_lib" - echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6 -echo "configure:4755: checking for compress in -lz" >&5 + fi + + zlib_lib="`echo $withval |cut -f2 -d, -s`" + if test -n "$zlib_lib"; then + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$zlib_lib" + echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6 +echo "configure:4709: checking for compress in -lz" >&5 ac_lib_var=`echo z'_'compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4759,7 +4713,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 4763 "configure" +#line 4717 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4770,7 +4724,7 @@ int main() { compress() ; return 0; } EOF -if { (eval echo configure:4774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4798,9 +4752,9 @@ else LDFLAGS="$saved_LDFLAGS" fi - else - echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6 -echo "configure:4804: checking for compress in -lz" >&5 + else + echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6 +echo "configure:4758: checking for compress in -lz" >&5 ac_lib_var=`echo z'_'compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4808,7 +4762,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 4812 "configure" +#line 4766 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4819,7 +4773,7 @@ int main() { compress() ; return 0; } EOF -if { (eval echo configure:4823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4846,25 +4800,24 @@ else echo "$ac_t""no" 1>&6 fi - fi - ;; -esac - - -SSL=yes + fi + ;; + esac +fi + SSL=yes # Check whether --with-ssl or --without-ssl was given. if test "${with_ssl+set}" = set; then withval="$with_ssl" : fi -if test "X-" != "X-$with_ssl"; then - LDFLAGS="$LDFLAGS -L$with_ssl" +if test -n "$with_ssl"; then + LDFLAGS="$LDFLAGS -L$with_ssl" fi echo $ac_n "checking for main in -lcrypto""... $ac_c" 1>&6 -echo "configure:4868: checking for main in -lcrypto" >&5 +echo "configure:4821: checking for main in -lcrypto" >&5 ac_lib_var=`echo crypto'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4872,14 +4825,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypto $LIBS" cat > conftest.$ac_ext <<EOF -#line 4876 "configure" +#line 4829 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:4883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4908,7 +4861,7 @@ unset SSL fi echo $ac_n "checking for SSL_get_version in -lssl""... $ac_c" 1>&6 -echo "configure:4912: checking for SSL_get_version in -lssl" >&5 +echo "configure:4865: checking for SSL_get_version in -lssl" >&5 ac_lib_var=`echo ssl'_'SSL_get_version | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4916,7 +4869,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lssl $LIBS" cat > conftest.$ac_ext <<EOF -#line 4920 "configure" +#line 4873 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4927,7 +4880,7 @@ int main() { SSL_get_version() ; return 0; } EOF -if { (eval echo configure:4931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4956,11 +4909,8 @@ unset SSL fi - -GASS=yes - -TESTGASS='$(srcdir)/testgass' - + GASS=yes + TESTGASS='$(srcdir)/testgass' # Check whether --with-gass or --without-gass was given. if test "${with_gass+set}" = set; then withval="$with_gass" @@ -4969,23 +4919,24 @@ else withval=no fi -case $withval in - yes) - for ac_hdr in globus_common.h + +case "$withval" in + yes) + for ac_hdr in globus_common.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4979: checking for $ac_hdr" >&5 +echo "configure:4930: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4984 "configure" +#line 4935 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4989: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4940: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5012,8 +4963,8 @@ unset GASS TESTGASS fi done - echo $ac_n "checking for globus_module_activate in -lglobus_common""... $ac_c" 1>&6 -echo "configure:5017: checking for globus_module_activate in -lglobus_common" >&5 + echo $ac_n "checking for globus_module_activate in -lglobus_common""... $ac_c" 1>&6 +echo "configure:4968: checking for globus_module_activate in -lglobus_common" >&5 ac_lib_var=`echo globus_common'_'globus_module_activate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5021,7 +4972,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_common $LIBS" cat > conftest.$ac_ext <<EOF -#line 5025 "configure" +#line 4976 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5032,7 +4983,7 @@ int main() { globus_module_activate() ; return 0; } EOF -if { (eval echo configure:5036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5060,8 +5011,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gass_cache""... $ac_c" 1>&6 -echo "configure:5065: checking for main in -lglobus_gass_cache" >&5 + echo $ac_n "checking for main in -lglobus_gass_cache""... $ac_c" 1>&6 +echo "configure:5016: checking for main in -lglobus_gass_cache" >&5 ac_lib_var=`echo globus_gass_cache'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5069,14 +5020,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_cache $LIBS" cat > conftest.$ac_ext <<EOF -#line 5073 "configure" +#line 5024 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5104,8 +5055,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gaa""... $ac_c" 1>&6 -echo "configure:5109: checking for main in -lglobus_gaa" >&5 + echo $ac_n "checking for main in -lglobus_gaa""... $ac_c" 1>&6 +echo "configure:5060: checking for main in -lglobus_gaa" >&5 ac_lib_var=`echo globus_gaa'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5113,14 +5064,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gaa $LIBS" cat > conftest.$ac_ext <<EOF -#line 5117 "configure" +#line 5068 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5148,8 +5099,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gss""... $ac_c" 1>&6 -echo "configure:5153: checking for main in -lglobus_gss" >&5 + echo $ac_n "checking for main in -lglobus_gss""... $ac_c" 1>&6 +echo "configure:5104: checking for main in -lglobus_gss" >&5 ac_lib_var=`echo globus_gss'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5157,14 +5108,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gss $LIBS" cat > conftest.$ac_ext <<EOF -#line 5161 "configure" +#line 5112 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5192,8 +5143,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gss_assist""... $ac_c" 1>&6 -echo "configure:5197: checking for main in -lglobus_gss_assist" >&5 + echo $ac_n "checking for main in -lglobus_gss_assist""... $ac_c" 1>&6 +echo "configure:5148: checking for main in -lglobus_gss_assist" >&5 ac_lib_var=`echo globus_gss_assist'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5201,14 +5152,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gss_assist $LIBS" cat > conftest.$ac_ext <<EOF -#line 5205 "configure" +#line 5156 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5236,8 +5187,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_io""... $ac_c" 1>&6 -echo "configure:5241: checking for main in -lglobus_io" >&5 + echo $ac_n "checking for main in -lglobus_io""... $ac_c" 1>&6 +echo "configure:5192: checking for main in -lglobus_io" >&5 ac_lib_var=`echo globus_io'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5245,14 +5196,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_io $LIBS" cat > conftest.$ac_ext <<EOF -#line 5249 "configure" +#line 5200 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5280,8 +5231,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gass_transfer_assist""... $ac_c" 1>&6 -echo "configure:5285: checking for main in -lglobus_gass_transfer_assist" >&5 + echo $ac_n "checking for main in -lglobus_gass_transfer_assist""... $ac_c" 1>&6 +echo "configure:5236: checking for main in -lglobus_gass_transfer_assist" >&5 ac_lib_var=`echo globus_gass_transfer_assist'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5289,14 +5240,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_transfer_assist $LIBS" cat > conftest.$ac_ext <<EOF -#line 5293 "configure" +#line 5244 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5324,8 +5275,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gass_transfer""... $ac_c" 1>&6 -echo "configure:5329: checking for main in -lglobus_gass_transfer" >&5 + echo $ac_n "checking for main in -lglobus_gass_transfer""... $ac_c" 1>&6 +echo "configure:5280: checking for main in -lglobus_gass_transfer" >&5 ac_lib_var=`echo globus_gass_transfer'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5333,14 +5284,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_transfer $LIBS" cat > conftest.$ac_ext <<EOF -#line 5337 "configure" +#line 5288 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5368,8 +5319,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for globus_gass_open in -lglobus_gass_file""... $ac_c" 1>&6 -echo "configure:5373: checking for globus_gass_open in -lglobus_gass_file" >&5 + echo $ac_n "checking for globus_gass_open in -lglobus_gass_file""... $ac_c" 1>&6 +echo "configure:5324: checking for globus_gass_open in -lglobus_gass_file" >&5 ac_lib_var=`echo globus_gass_file'_'globus_gass_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5377,7 +5328,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_file $LIBS" cat > conftest.$ac_ext <<EOF -#line 5381 "configure" +#line 5332 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5388,7 +5339,7 @@ int main() { globus_gass_open() ; return 0; } EOF -if { (eval echo configure:5392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5416,33 +5367,33 @@ else unset GASS TESTGASS fi - ;; - no) - echo $ac_n "checking for GASS""... $ac_c" 1>&6 -echo "configure:5423: checking for GASS" >&5 - echo "$ac_t""suppressed" 1>&6 - unset GASS TESTGASS - ;; - *) - gass_inc="`echo $withval |cut -f1 -d,`" - if test "X" != "$gass_inc"; then - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$gass_inc" - for ac_hdr in globus_common.h + ;; + no) + echo $ac_n "checking for GASS""... $ac_c" 1>&6 +echo "configure:5374: checking for GASS" >&5 + echo "$ac_t""suppressed" 1>&6 + unset GASS TESTGASS + ;; + *) + gass_inc="`echo $withval |cut -f1 -d,`" + if test -n "$gass_inc"; then + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I$gass_inc" + for ac_hdr in globus_common.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5436: checking for $ac_hdr" >&5 +echo "configure:5387: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5441 "configure" +#line 5392 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5397: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5466,27 +5417,26 @@ EOF else echo "$ac_t""no" 1>&6 CPPFLAGS="$saved_CPPFLAGS" - unset GASS TESTGASS - + unset GASS TESTGASS fi done - else - for ac_hdr in globus_common.h + else + for ac_hdr in globus_common.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5480: checking for $ac_hdr" >&5 +echo "configure:5430: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5485 "configure" +#line 5435 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5490: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5440: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5512,14 +5462,14 @@ else fi done - fi + fi - gass_lib="`echo $withval |cut -f2 -d, -s`" - if test "X" != "$gass_lib"; then - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$gass_lib" - echo $ac_n "checking for globus_module_activate in -lglobus_common""... $ac_c" 1>&6 -echo "configure:5523: checking for globus_module_activate in -lglobus_common" >&5 + gass_lib="`echo $withval |cut -f2 -d, -s`" + if test -n "$gass_lib"; then + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$gass_lib" + echo $ac_n "checking for globus_module_activate in -lglobus_common""... $ac_c" 1>&6 +echo "configure:5473: checking for globus_module_activate in -lglobus_common" >&5 ac_lib_var=`echo globus_common'_'globus_module_activate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5527,7 +5477,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_common $LIBS" cat > conftest.$ac_ext <<EOF -#line 5531 "configure" +#line 5481 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5538,7 +5488,7 @@ int main() { globus_module_activate() ; return 0; } EOF -if { (eval echo configure:5542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5566,8 +5516,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gass_cache""... $ac_c" 1>&6 -echo "configure:5571: checking for main in -lglobus_gass_cache" >&5 + echo $ac_n "checking for main in -lglobus_gass_cache""... $ac_c" 1>&6 +echo "configure:5521: checking for main in -lglobus_gass_cache" >&5 ac_lib_var=`echo globus_gass_cache'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5575,14 +5525,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_cache $LIBS" cat > conftest.$ac_ext <<EOF -#line 5579 "configure" +#line 5529 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5610,8 +5560,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gaa""... $ac_c" 1>&6 -echo "configure:5615: checking for main in -lglobus_gaa" >&5 + echo $ac_n "checking for main in -lglobus_gaa""... $ac_c" 1>&6 +echo "configure:5565: checking for main in -lglobus_gaa" >&5 ac_lib_var=`echo globus_gaa'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5619,14 +5569,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gaa $LIBS" cat > conftest.$ac_ext <<EOF -#line 5623 "configure" +#line 5573 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5654,8 +5604,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gss""... $ac_c" 1>&6 -echo "configure:5659: checking for main in -lglobus_gss" >&5 + echo $ac_n "checking for main in -lglobus_gss""... $ac_c" 1>&6 +echo "configure:5609: checking for main in -lglobus_gss" >&5 ac_lib_var=`echo globus_gss'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5663,14 +5613,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gss $LIBS" cat > conftest.$ac_ext <<EOF -#line 5667 "configure" +#line 5617 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5698,8 +5648,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gss_assist""... $ac_c" 1>&6 -echo "configure:5703: checking for main in -lglobus_gss_assist" >&5 + echo $ac_n "checking for main in -lglobus_gss_assist""... $ac_c" 1>&6 +echo "configure:5653: checking for main in -lglobus_gss_assist" >&5 ac_lib_var=`echo globus_gss_assist'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5707,14 +5657,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gss_assist $LIBS" cat > conftest.$ac_ext <<EOF -#line 5711 "configure" +#line 5661 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5742,8 +5692,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_io""... $ac_c" 1>&6 -echo "configure:5747: checking for main in -lglobus_io" >&5 + echo $ac_n "checking for main in -lglobus_io""... $ac_c" 1>&6 +echo "configure:5697: checking for main in -lglobus_io" >&5 ac_lib_var=`echo globus_io'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5751,14 +5701,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_io $LIBS" cat > conftest.$ac_ext <<EOF -#line 5755 "configure" +#line 5705 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5786,8 +5736,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gass_transfer_assist""... $ac_c" 1>&6 -echo "configure:5791: checking for main in -lglobus_gass_transfer_assist" >&5 + echo $ac_n "checking for main in -lglobus_gass_transfer_assist""... $ac_c" 1>&6 +echo "configure:5741: checking for main in -lglobus_gass_transfer_assist" >&5 ac_lib_var=`echo globus_gass_transfer_assist'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5795,14 +5745,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_transfer_assist $LIBS" cat > conftest.$ac_ext <<EOF -#line 5799 "configure" +#line 5749 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5830,8 +5780,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gass_transfer""... $ac_c" 1>&6 -echo "configure:5835: checking for main in -lglobus_gass_transfer" >&5 + echo $ac_n "checking for main in -lglobus_gass_transfer""... $ac_c" 1>&6 +echo "configure:5785: checking for main in -lglobus_gass_transfer" >&5 ac_lib_var=`echo globus_gass_transfer'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5839,14 +5789,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_transfer $LIBS" cat > conftest.$ac_ext <<EOF -#line 5843 "configure" +#line 5793 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5874,8 +5824,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for globus_gass_open in -lglobus_gass_file""... $ac_c" 1>&6 -echo "configure:5879: checking for globus_gass_open in -lglobus_gass_file" >&5 + echo $ac_n "checking for globus_gass_open in -lglobus_gass_file""... $ac_c" 1>&6 +echo "configure:5829: checking for globus_gass_open in -lglobus_gass_file" >&5 ac_lib_var=`echo globus_gass_file'_'globus_gass_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5883,7 +5833,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_file $LIBS" cat > conftest.$ac_ext <<EOF -#line 5887 "configure" +#line 5837 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5894,7 +5844,7 @@ int main() { globus_gass_open() ; return 0; } EOF -if { (eval echo configure:5898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5922,9 +5872,9 @@ else unset GASS TESTGASS fi - else - echo $ac_n "checking for globus_module_activate in -lglobus_common""... $ac_c" 1>&6 -echo "configure:5928: checking for globus_module_activate in -lglobus_common" >&5 + else + echo $ac_n "checking for globus_module_activate in -lglobus_common""... $ac_c" 1>&6 +echo "configure:5878: checking for globus_module_activate in -lglobus_common" >&5 ac_lib_var=`echo globus_common'_'globus_module_activate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5932,7 +5882,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_common $LIBS" cat > conftest.$ac_ext <<EOF -#line 5936 "configure" +#line 5886 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5943,7 +5893,7 @@ int main() { globus_module_activate() ; return 0; } EOF -if { (eval echo configure:5947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5971,8 +5921,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gass_cache""... $ac_c" 1>&6 -echo "configure:5976: checking for main in -lglobus_gass_cache" >&5 + echo $ac_n "checking for main in -lglobus_gass_cache""... $ac_c" 1>&6 +echo "configure:5926: checking for main in -lglobus_gass_cache" >&5 ac_lib_var=`echo globus_gass_cache'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5980,14 +5930,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_cache $LIBS" cat > conftest.$ac_ext <<EOF -#line 5984 "configure" +#line 5934 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6015,8 +5965,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gaa""... $ac_c" 1>&6 -echo "configure:6020: checking for main in -lglobus_gaa" >&5 + echo $ac_n "checking for main in -lglobus_gaa""... $ac_c" 1>&6 +echo "configure:5970: checking for main in -lglobus_gaa" >&5 ac_lib_var=`echo globus_gaa'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6024,14 +5974,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gaa $LIBS" cat > conftest.$ac_ext <<EOF -#line 6028 "configure" +#line 5978 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6059,8 +6009,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gss""... $ac_c" 1>&6 -echo "configure:6064: checking for main in -lglobus_gss" >&5 + echo $ac_n "checking for main in -lglobus_gss""... $ac_c" 1>&6 +echo "configure:6014: checking for main in -lglobus_gss" >&5 ac_lib_var=`echo globus_gss'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6068,14 +6018,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gss $LIBS" cat > conftest.$ac_ext <<EOF -#line 6072 "configure" +#line 6022 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6103,8 +6053,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gss_assist""... $ac_c" 1>&6 -echo "configure:6108: checking for main in -lglobus_gss_assist" >&5 + echo $ac_n "checking for main in -lglobus_gss_assist""... $ac_c" 1>&6 +echo "configure:6058: checking for main in -lglobus_gss_assist" >&5 ac_lib_var=`echo globus_gss_assist'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6112,14 +6062,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gss_assist $LIBS" cat > conftest.$ac_ext <<EOF -#line 6116 "configure" +#line 6066 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6147,8 +6097,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_io""... $ac_c" 1>&6 -echo "configure:6152: checking for main in -lglobus_io" >&5 + echo $ac_n "checking for main in -lglobus_io""... $ac_c" 1>&6 +echo "configure:6102: checking for main in -lglobus_io" >&5 ac_lib_var=`echo globus_io'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6156,14 +6106,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_io $LIBS" cat > conftest.$ac_ext <<EOF -#line 6160 "configure" +#line 6110 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6191,8 +6141,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gass_transfer_assist""... $ac_c" 1>&6 -echo "configure:6196: checking for main in -lglobus_gass_transfer_assist" >&5 + echo $ac_n "checking for main in -lglobus_gass_transfer_assist""... $ac_c" 1>&6 +echo "configure:6146: checking for main in -lglobus_gass_transfer_assist" >&5 ac_lib_var=`echo globus_gass_transfer_assist'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6200,14 +6150,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_transfer_assist $LIBS" cat > conftest.$ac_ext <<EOF -#line 6204 "configure" +#line 6154 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6235,8 +6185,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gass_transfer""... $ac_c" 1>&6 -echo "configure:6240: checking for main in -lglobus_gass_transfer" >&5 + echo $ac_n "checking for main in -lglobus_gass_transfer""... $ac_c" 1>&6 +echo "configure:6190: checking for main in -lglobus_gass_transfer" >&5 ac_lib_var=`echo globus_gass_transfer'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6244,14 +6194,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_transfer $LIBS" cat > conftest.$ac_ext <<EOF -#line 6248 "configure" +#line 6198 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6279,8 +6229,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for globus_gass_open in -lglobus_gass_file""... $ac_c" 1>&6 -echo "configure:6284: checking for globus_gass_open in -lglobus_gass_file" >&5 + echo $ac_n "checking for globus_gass_open in -lglobus_gass_file""... $ac_c" 1>&6 +echo "configure:6234: checking for globus_gass_open in -lglobus_gass_file" >&5 ac_lib_var=`echo globus_gass_file'_'globus_gass_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6288,7 +6238,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_file $LIBS" cat > conftest.$ac_ext <<EOF -#line 6292 "configure" +#line 6242 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6299,7 +6249,7 @@ int main() { globus_gass_open() ; return 0; } EOF -if { (eval echo configure:6303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6327,20 +6277,19 @@ else unset GASS TESTGASS fi - fi - ;; + fi + ;; esac -if test "X-" != "X-$GASS"; then - cat >> confdefs.h <<\EOF + +if test -n "$GASS"; then + cat >> confdefs.h <<\EOF #define HAVE_GASS 1 EOF fi - -SRB=yes - -TESTSRB='$(srcdir)/testsrb' + SRB=yes + TESTSRB='$(srcdir)/testsrb' # Check whether --with-srb or --without-srb was given. if test "${with_srb+set}" = set; then withval="$with_srb" @@ -6349,23 +6298,24 @@ else withval=no fi -case $withval in - yes) - for ac_hdr in srbClient.h + +case "$withval" in + yes) + for ac_hdr in srbClient.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6359: checking for $ac_hdr" >&5 +echo "configure:6309: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6364 "configure" +#line 6314 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6369: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6392,8 +6342,8 @@ unset SRB TESTSRB fi done - echo $ac_n "checking for main in -lelf""... $ac_c" 1>&6 -echo "configure:6397: checking for main in -lelf" >&5 + echo $ac_n "checking for main in -lelf""... $ac_c" 1>&6 +echo "configure:6347: checking for main in -lelf" >&5 ac_lib_var=`echo elf'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6401,14 +6351,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lelf $LIBS" cat > conftest.$ac_ext <<EOF -#line 6405 "configure" +#line 6355 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6436,8 +6386,8 @@ else unset SRB TESTSRB fi - echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:6441: checking for main in -lsocket" >&5 + echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 +echo "configure:6391: checking for main in -lsocket" >&5 ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6445,14 +6395,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 6449 "configure" +#line 6399 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6480,8 +6430,8 @@ else unset SRB TESTSRB fi - echo $ac_n "checking for clConnect in -lSrbClient""... $ac_c" 1>&6 -echo "configure:6485: checking for clConnect in -lSrbClient" >&5 + echo $ac_n "checking for clConnect in -lSrbClient""... $ac_c" 1>&6 +echo "configure:6435: checking for clConnect in -lSrbClient" >&5 ac_lib_var=`echo SrbClient'_'clConnect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6489,7 +6439,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lSrbClient $LIBS" cat > conftest.$ac_ext <<EOF -#line 6493 "configure" +#line 6443 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6500,7 +6450,7 @@ int main() { clConnect() ; return 0; } EOF -if { (eval echo configure:6504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6528,33 +6478,33 @@ else unset SRB TESTSRB fi - ;; - no) - echo $ac_n "checking for SRB""... $ac_c" 1>&6 -echo "configure:6535: checking for SRB" >&5 - echo "$ac_t""suppressed" 1>&6 - unset SRB TESTSRB - ;; - *) - srb_inc="`echo $withval |cut -f1 -d,`" - if test "X" != "$srb_inc"; then - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$srb_inc" - for ac_hdr in srbClient.h + ;; + no) + echo $ac_n "checking for SRB""... $ac_c" 1>&6 +echo "configure:6485: checking for SRB" >&5 + echo "$ac_t""suppressed" 1>&6 + unset SRB TESTSRB + ;; + *) + srb_inc="`echo $withval |cut -f1 -d,`" + if test -n "$srb_inc"; then + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I$srb_inc" + for ac_hdr in srbClient.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6548: checking for $ac_hdr" >&5 +echo "configure:6498: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6553 "configure" +#line 6503 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6508: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6578,26 +6528,26 @@ EOF else echo "$ac_t""no" 1>&6 CPPFLAGS="$saved_CPPFLAGS" - unset SRB TESTSRB + unset SRB TESTSRB fi done - else - for ac_hdr in srbClient.h + else + for ac_hdr in srbClient.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6591: checking for $ac_hdr" >&5 +echo "configure:6541: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6596 "configure" +#line 6546 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6601: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6551: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6623,14 +6573,14 @@ else fi done - fi + fi - srb_lib="`echo $withval |cut -f2 -d, -s`" - if test "X" != "$srb_lib"; then - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$srb_lib" - echo $ac_n "checking for main in -lelf""... $ac_c" 1>&6 -echo "configure:6634: checking for main in -lelf" >&5 + srb_lib="`echo $withval |cut -f2 -d, -s`" + if test -n "$srb_lib"; then + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$srb_lib" + echo $ac_n "checking for main in -lelf""... $ac_c" 1>&6 +echo "configure:6584: checking for main in -lelf" >&5 ac_lib_var=`echo elf'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6638,14 +6588,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lelf $LIBS" cat > conftest.$ac_ext <<EOF -#line 6642 "configure" +#line 6592 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6673,8 +6623,8 @@ else unset SRB TESTSRB fi - echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:6678: checking for main in -lsocket" >&5 + echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 +echo "configure:6628: checking for main in -lsocket" >&5 ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6682,14 +6632,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 6686 "configure" +#line 6636 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6717,8 +6667,8 @@ else unset SRB TESTSRB fi - echo $ac_n "checking for clConnect in -lSrbClient""... $ac_c" 1>&6 -echo "configure:6722: checking for clConnect in -lSrbClient" >&5 + echo $ac_n "checking for clConnect in -lSrbClient""... $ac_c" 1>&6 +echo "configure:6672: checking for clConnect in -lSrbClient" >&5 ac_lib_var=`echo SrbClient'_'clConnect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6726,7 +6676,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lSrbClient $LIBS" cat > conftest.$ac_ext <<EOF -#line 6730 "configure" +#line 6680 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6737,7 +6687,7 @@ int main() { clConnect() ; return 0; } EOF -if { (eval echo configure:6741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6765,9 +6715,9 @@ else unset SRB TESTSRB fi - else - echo $ac_n "checking for main in -lelf""... $ac_c" 1>&6 -echo "configure:6771: checking for main in -lelf" >&5 + else + echo $ac_n "checking for main in -lelf""... $ac_c" 1>&6 +echo "configure:6721: checking for main in -lelf" >&5 ac_lib_var=`echo elf'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6775,14 +6725,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lelf $LIBS" cat > conftest.$ac_ext <<EOF -#line 6779 "configure" +#line 6729 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6810,8 +6760,8 @@ else unset SRB TESTSRB fi - echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:6815: checking for main in -lsocket" >&5 + echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 +echo "configure:6765: checking for main in -lsocket" >&5 ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6819,14 +6769,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 6823 "configure" +#line 6773 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6854,8 +6804,8 @@ else unset SRB TESTSRB fi - echo $ac_n "checking for clConnect in -lSrbClient""... $ac_c" 1>&6 -echo "configure:6859: checking for clConnect in -lSrbClient" >&5 + echo $ac_n "checking for clConnect in -lSrbClient""... $ac_c" 1>&6 +echo "configure:6809: checking for clConnect in -lSrbClient" >&5 ac_lib_var=`echo SrbClient'_'clConnect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6863,7 +6813,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lSrbClient $LIBS" cat > conftest.$ac_ext <<EOF -#line 6867 "configure" +#line 6817 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6874,7 +6824,7 @@ int main() { clConnect() ; return 0; } EOF -if { (eval echo configure:6878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6902,21 +6852,18 @@ else unset SRB TESTSRB fi - fi - ;; + fi + ;; esac -if test "X-" != "X-$SRB"; then +if test -n "$SRB"; then cat >> confdefs.h <<\EOF #define HAVE_SRB 1 EOF fi - -GRIDSTORAGE=yes - -TESTGRIDSTORAGE='$(srcdir)/testgridstorage' - + GRIDSTORAGE=yes + TESTGRIDSTORAGE='$(srcdir)/testgridstorage' # Check whether --with-gridstorage or --without-gridstorage was given. if test "${with_gridstorage+set}" = set; then withval="$with_gridstorage" @@ -6925,23 +6872,24 @@ else withval=no fi -case $withval in - yes) - for ac_hdr in grid_storage_file.h + +case "$withval" in + yes) + for ac_hdr in grid_storage_file.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6935: checking for $ac_hdr" >&5 +echo "configure:6883: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6940 "configure" +#line 6888 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6968,8 +6916,8 @@ unset GRIDSTORAGE TESTGRIDSTORAGE fi done - echo $ac_n "checking for main in -lgrid_storage_client""... $ac_c" 1>&6 -echo "configure:6973: checking for main in -lgrid_storage_client" >&5 + echo $ac_n "checking for main in -lgrid_storage_client""... $ac_c" 1>&6 +echo "configure:6921: checking for main in -lgrid_storage_client" >&5 ac_lib_var=`echo grid_storage_client'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6977,14 +6925,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lgrid_storage_client $LIBS" cat > conftest.$ac_ext <<EOF -#line 6981 "configure" +#line 6929 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7012,8 +6960,8 @@ else unset GRIDSTORAGE TESTGRIDSTORAGE fi - echo $ac_n "checking for grid_storage_open in -lgrid_storage_file""... $ac_c" 1>&6 -echo "configure:7017: checking for grid_storage_open in -lgrid_storage_file" >&5 + echo $ac_n "checking for grid_storage_open in -lgrid_storage_file""... $ac_c" 1>&6 +echo "configure:6965: checking for grid_storage_open in -lgrid_storage_file" >&5 ac_lib_var=`echo grid_storage_file'_'grid_storage_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7021,7 +6969,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgrid_storage_file $LIBS" cat > conftest.$ac_ext <<EOF -#line 7025 "configure" +#line 6973 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7032,7 +6980,7 @@ int main() { grid_storage_open() ; return 0; } EOF -if { (eval echo configure:7036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7060,33 +7008,33 @@ else unset GRIDSTORAGE TESTGRIDSTORAGE fi - ;; - no) - echo $ac_n "checking for GRIDSTORAGE""... $ac_c" 1>&6 -echo "configure:7067: checking for GRIDSTORAGE" >&5 - echo "$ac_t""suppressed" 1>&6 - unset GRIDSTORAGE TESTGRIDSTORAGE - ;; - *) - gridstorage_inc="`echo $withval |cut -f1 -d,`" - if test "X" != "$gridstorage_inc"; then - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$gridstorage_inc" - for ac_hdr in grid_storage_file.h + ;; + no) + echo $ac_n "checking for GRIDSTORAGE""... $ac_c" 1>&6 +echo "configure:7015: checking for GRIDSTORAGE" >&5 + echo "$ac_t""suppressed" 1>&6 + unset GRIDSTORAGE TESTGRIDSTORAGE + ;; + *) + gridstorage_inc="`echo $withval |cut -f1 -d,`" + if test -n "$gridstorage_inc"; then + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I$gridstorage_inc" + for ac_hdr in grid_storage_file.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7080: checking for $ac_hdr" >&5 +echo "configure:7028: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7085 "configure" +#line 7033 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7038: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7110,27 +7058,26 @@ EOF else echo "$ac_t""no" 1>&6 CPPFLAGS="$saved_CPPFLAGS" - unset GRIDSTORAGE TESTGRIDSTORAGE - + unset GRIDSTORAGE TESTGRIDSTORAGE fi done - else - for ac_hdr in grid_storage_file.h + else + for ac_hdr in grid_storage_file.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7124: checking for $ac_hdr" >&5 +echo "configure:7071: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7129 "configure" +#line 7076 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7134: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7156,14 +7103,14 @@ else fi done - fi + fi - gridstorage_lib="`echo $withval |cut -f2 -d, -s`" - if test "X" != "$gridstorage_lib"; then - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$gridstorage_lib" - echo $ac_n "checking for main in -lgrid_storage_client""... $ac_c" 1>&6 -echo "configure:7167: checking for main in -lgrid_storage_client" >&5 + gridstorage_lib="`echo $withval |cut -f2 -d, -s`" + if test -n "$gridstorage_lib"; then + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$gridstorage_lib" + echo $ac_n "checking for main in -lgrid_storage_client""... $ac_c" 1>&6 +echo "configure:7114: checking for main in -lgrid_storage_client" >&5 ac_lib_var=`echo grid_storage_client'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7171,14 +7118,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lgrid_storage_client $LIBS" cat > conftest.$ac_ext <<EOF -#line 7175 "configure" +#line 7122 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:7182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7206,8 +7153,8 @@ else unset GRIDSTORAGE TESTGRIDSTORAGE fi - echo $ac_n "checking for grid_storage_open in -lgrid_storage_file""... $ac_c" 1>&6 -echo "configure:7211: checking for grid_storage_open in -lgrid_storage_file" >&5 + echo $ac_n "checking for grid_storage_open in -lgrid_storage_file""... $ac_c" 1>&6 +echo "configure:7158: checking for grid_storage_open in -lgrid_storage_file" >&5 ac_lib_var=`echo grid_storage_file'_'grid_storage_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7215,7 +7162,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgrid_storage_file $LIBS" cat > conftest.$ac_ext <<EOF -#line 7219 "configure" +#line 7166 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7226,7 +7173,7 @@ int main() { grid_storage_open() ; return 0; } EOF -if { (eval echo configure:7230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7254,9 +7201,9 @@ else unset GRIDSTORAGE TESTGRIDSTORAGE fi - else - echo $ac_n "checking for main in -lgrid_storage_client""... $ac_c" 1>&6 -echo "configure:7260: checking for main in -lgrid_storage_client" >&5 + else + echo $ac_n "checking for main in -lgrid_storage_client""... $ac_c" 1>&6 +echo "configure:7207: checking for main in -lgrid_storage_client" >&5 ac_lib_var=`echo grid_storage_client'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7264,14 +7211,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lgrid_storage_client $LIBS" cat > conftest.$ac_ext <<EOF -#line 7268 "configure" +#line 7215 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:7275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7299,8 +7246,8 @@ else unset GRIDSTORAGE TESTGRIDSTORAGE fi - echo $ac_n "checking for grid_storage_open in -lgrid_storage_file""... $ac_c" 1>&6 -echo "configure:7304: checking for grid_storage_open in -lgrid_storage_file" >&5 + echo $ac_n "checking for grid_storage_open in -lgrid_storage_file""... $ac_c" 1>&6 +echo "configure:7251: checking for grid_storage_open in -lgrid_storage_file" >&5 ac_lib_var=`echo grid_storage_file'_'grid_storage_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7308,7 +7255,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgrid_storage_file $LIBS" cat > conftest.$ac_ext <<EOF -#line 7312 "configure" +#line 7259 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7319,7 +7266,7 @@ int main() { grid_storage_open() ; return 0; } EOF -if { (eval echo configure:7323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7347,11 +7294,12 @@ else unset GRIDSTORAGE TESTGRIDSTORAGE fi - fi - ;; + fi + ;; esac -if test "X-" != "X-$GRIDSTORAGE"; then - cat >> confdefs.h <<\EOF + +if test -n "$GRIDSTORAGE"; then + cat >> confdefs.h <<\EOF #define HAVE_GRIDSTORAGE 1 EOF @@ -7359,7 +7307,7 @@ fi echo $ac_n "checking for PD_open in -lpdb""... $ac_c" 1>&6 -echo "configure:7363: checking for PD_open in -lpdb" >&5 +echo "configure:7311: checking for PD_open in -lpdb" >&5 ac_lib_var=`echo pdb'_'PD_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7367,7 +7315,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpdb $LIBS" cat > conftest.$ac_ext <<EOF -#line 7371 "configure" +#line 7319 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7378,7 +7326,7 @@ int main() { PD_open() ; return 0; } EOF -if { (eval echo configure:7382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7406,7 +7354,7 @@ else fi echo $ac_n "checking for lite_PD_open in -lsilo""... $ac_c" 1>&6 -echo "configure:7410: checking for lite_PD_open in -lsilo" >&5 +echo "configure:7358: checking for lite_PD_open in -lsilo" >&5 ac_lib_var=`echo silo'_'lite_PD_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7414,7 +7362,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsilo $LIBS" cat > conftest.$ac_ext <<EOF -#line 7418 "configure" +#line 7366 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7425,7 +7373,7 @@ int main() { lite_PD_open() ; return 0; } EOF -if { (eval echo configure:7429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7456,17 +7404,17 @@ for ac_hdr in pdb.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7460: checking for $ac_hdr" >&5 +echo "configure:7408: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7465 "configure" +#line 7413 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7470: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7418: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7541,8 +7489,7 @@ fi rm -f confcache - -PTHREAD=yes + PTHREAD=yes # Check whether --with-pthread or --without-pthread was given. if test "${with_pthread+set}" = set; then @@ -7552,23 +7499,24 @@ else withval=no fi -case $withval in - yes) - for ac_hdr in pthread.h + +case "$withval" in + yes) + for ac_hdr in pthread.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7562: checking for $ac_hdr" >&5 +echo "configure:7510: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7567 "configure" +#line 7515 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7572: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7520: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7594,9 +7542,9 @@ else fi done - if test `uname` != "FreeBSD"; then - echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:7600: checking for pthread_create in -lpthread" >&5 + if test `uname` != "FreeBSD"; then + echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 +echo "configure:7548: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7604,7 +7552,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <<EOF -#line 7608 "configure" +#line 7556 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7615,7 +7563,7 @@ int main() { pthread_create() ; return 0; } EOF -if { (eval echo configure:7619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7643,37 +7591,37 @@ else unset PTHREAD fi - else - CFLAGS="$CFLAGS -D_THREAD_SAFE" - LDFLAGS="$LDFLAGS -pthread" - fi - ;; - no) - echo $ac_n "checking for pthread""... $ac_c" 1>&6 -echo "configure:7654: checking for pthread" >&5 - echo "$ac_t""suppressed" 1>&6 - unset PTHREAD - ;; - *) - pthread_inc="`echo $withval |cut -f1 -d,`" - if test "X-" != "X-$pthread_inc"; then - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$pthread_inc" - for ac_hdr in pthread.h + else + CFLAGS="$CFLAGS -D_THREAD_SAFE" + LDFLAGS="$LDFLAGS -pthread" + fi + ;; + no) + echo $ac_n "checking for pthread""... $ac_c" 1>&6 +echo "configure:7602: checking for pthread" >&5 + echo "$ac_t""suppressed" 1>&6 + unset PTHREAD + ;; + *) + pthread_inc="`echo $withval |cut -f1 -d,`" + if test -n "$pthread_inc"; then + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I$pthread_inc" + for ac_hdr in pthread.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7667: checking for $ac_hdr" >&5 +echo "configure:7615: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7672 "configure" +#line 7620 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7625: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7700,22 +7648,22 @@ CPPFLAGS="$saved_CPPFLAGS"; unset PTHREAD fi done - else - for ac_hdr in pthread.h + else + for ac_hdr in pthread.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7709: checking for $ac_hdr" >&5 +echo "configure:7657: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7714 "configure" +#line 7662 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7667: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7742,14 +7690,14 @@ unset PTHREAD fi done - fi + fi - pthread_lib="`echo $withval |cut -f2 -d, -s`" - if test "X-" != "X-$pthread_lib"; then - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$pthread_lib" - echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:7753: checking for pthread_create in -lpthread" >&5 + pthread_lib="`echo $withval |cut -f2 -d, -s`" + if test -n "$pthread_lib"; then + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$pthread_lib" + echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 +echo "configure:7701: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7757,7 +7705,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <<EOF -#line 7761 "configure" +#line 7709 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7768,7 +7716,7 @@ int main() { pthread_create() ; return 0; } EOF -if { (eval echo configure:7772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7796,9 +7744,9 @@ else LDFLAGS="$saved_LDFLAGS"; unset PTHREAD fi - else - echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:7802: checking for pthread_create in -lpthread" >&5 + else + echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 +echo "configure:7750: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7806,7 +7754,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <<EOF -#line 7810 "configure" +#line 7758 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7817,7 +7765,7 @@ int main() { pthread_create() ; return 0; } EOF -if { (eval echo configure:7821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7845,12 +7793,12 @@ else unset PTHREAD fi - fi - ;; + fi + ;; esac echo $ac_n "checking for thread safe support""... $ac_c" 1>&6 -echo "configure:7854: checking for thread safe support" >&5 +echo "configure:7802: checking for thread safe support" >&5 # Check whether --enable-threadsafe or --disable-threadsafe was given. if test "${enable_threadsafe+set}" = set; then enableval="$enable_threadsafe" @@ -7858,26 +7806,26 @@ if test "${enable_threadsafe+set}" = set; then fi -case X-$THREADSAFE in - X-|X-no) - echo "$ac_t""no" 1>&6 - ;; - X-yes) - if test X- = X-$PTHREAD; then - echo "$ac_t""error" 1>&6 - { echo "configure: error: needed pthread library not available" 1>&2; exit 1; } - else - echo "$ac_t""yes" 1>&6 - THREADSAFE=yes - fi - ;; - *) - echo "$ac_t""error" 1>&6 - { echo "configure: error: \"$enableval\" is not a valid threadsafe type" 1>&2; exit 1; } - ;; +case "X-$THREADSAFE" in + X-|X-no) + echo "$ac_t""no" 1>&6 + ;; + X-yes) + if test -n "$PTHREAD"; then + echo "$ac_t""yes" 1>&6 + THREADSAFE=yes + else + echo "$ac_t""error" 1>&6 + { echo "configure: error: needed pthread library not available" 1>&2; exit 1; } + fi + ;; + *) + echo "$ac_t""error" 1>&6 + { echo "configure: error: \'$enableval\' is not a valid threadsafe type" 1>&2; exit 1; } + ;; esac -if test X-yes = X-$THREADSAFE; then +if test "X$THREADSAFE" = "Xyes"; then cat >> confdefs.h <<\EOF #define HAVE_THREADSAFE 1 EOF @@ -7886,9 +7834,9 @@ fi echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 -echo "configure:7890: checking for tm_gmtoff in struct tm" >&5 +echo "configure:7838: checking for tm_gmtoff in struct tm" >&5 cat > conftest.$ac_ext <<EOF -#line 7892 "configure" +#line 7840 "configure" #include "confdefs.h" #include <sys/time.h> @@ -7897,7 +7845,7 @@ int main() { struct tm tm; tm.tm_gmtoff=0; ; return 0; } EOF -if { (eval echo configure:7901: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TM_GMTOFF 1 @@ -7913,9 +7861,9 @@ fi rm -f conftest* echo $ac_n "checking for __tm_gmtoff in struct tm""... $ac_c" 1>&6 -echo "configure:7917: checking for __tm_gmtoff in struct tm" >&5 +echo "configure:7865: checking for __tm_gmtoff in struct tm" >&5 cat > conftest.$ac_ext <<EOF -#line 7919 "configure" +#line 7867 "configure" #include "confdefs.h" #include <sys/time.h> @@ -7924,7 +7872,7 @@ int main() { struct tm tm; tm.__tm_gmtoff=0; ; return 0; } EOF -if { (eval echo configure:7928: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE___TM_GMTOFF 1 @@ -7940,9 +7888,9 @@ fi rm -f conftest* echo $ac_n "checking for global timezone variable""... $ac_c" 1>&6 -echo "configure:7944: checking for global timezone variable" >&5 +echo "configure:7892: checking for global timezone variable" >&5 cat > conftest.$ac_ext <<EOF -#line 7946 "configure" +#line 7894 "configure" #include "confdefs.h" #include <sys/time.h> @@ -7951,7 +7899,7 @@ int main() { timezone=0; ; return 0; } EOF -if { (eval echo configure:7955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TIMEZONE 1 @@ -7967,12 +7915,12 @@ fi rm -f conftest* echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:7971: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:7919: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7976 "configure" +#line 7924 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -7980,7 +7928,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:7984: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -8001,12 +7949,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:8005: checking for tm_zone in struct tm" >&5 +echo "configure:7953: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8010 "configure" +#line 7958 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_cv_struct_tm> @@ -8014,7 +7962,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:8018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -8034,12 +7982,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:8038: checking for tzname" >&5 +echo "configure:7986: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8043 "configure" +#line 7991 "configure" #include "confdefs.h" #include <time.h> #ifndef tzname /* For SGI. */ @@ -8049,7 +7997,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:8053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -8071,9 +8019,9 @@ EOF fi echo $ac_n "checking for struct timezone""... $ac_c" 1>&6 -echo "configure:8075: checking for struct timezone" >&5 +echo "configure:8023: checking for struct timezone" >&5 cat > conftest.$ac_ext <<EOF -#line 8077 "configure" +#line 8025 "configure" #include "confdefs.h" #include <sys/types.h> @@ -8083,7 +8031,7 @@ int main() { struct timezone tz; tz.tz_minuteswest=0; ; return 0; } EOF -if { (eval echo configure:8087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STRUCT_TIMEZONE 1 @@ -8099,9 +8047,9 @@ fi rm -f conftest* echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:8103: checking for st_blocks in struct stat" >&5 +echo "configure:8051: checking for st_blocks in struct stat" >&5 cat > conftest.$ac_ext <<EOF -#line 8105 "configure" +#line 8053 "configure" #include "confdefs.h" #include <sys/stat.h> @@ -8109,7 +8057,7 @@ int main() { struct stat sb; sb.st_blocks=0; ; return 0; } EOF -if { (eval echo configure:8113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STAT_ST_BLOCKS 1 @@ -8127,12 +8075,12 @@ rm -f conftest* for ac_func in _getvideoconfig gettextinfo GetConsoleScreenBufferInfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8131: checking for $ac_func" >&5 +echo "configure:8079: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8136 "configure" +#line 8084 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8155,7 +8103,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:8159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8182,12 +8130,12 @@ done for ac_func in _scrsize ioctl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8186: checking for $ac_func" >&5 +echo "configure:8134: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8191 "configure" +#line 8139 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8210,7 +8158,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:8214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8236,16 +8184,16 @@ done echo $ac_n "checking for struct videoconfig""... $ac_c" 1>&6 -echo "configure:8240: checking for struct videoconfig" >&5 +echo "configure:8188: checking for struct videoconfig" >&5 cat > conftest.$ac_ext <<EOF -#line 8242 "configure" +#line 8190 "configure" #include "confdefs.h" int main() { struct videoconfig w; w.numtextcols=0; ; return 0; } EOF -if { (eval echo configure:8249: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8197: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STRUCT_VIDEOCONFIG 1 @@ -8261,16 +8209,16 @@ fi rm -f conftest* echo $ac_n "checking for struct text_info""... $ac_c" 1>&6 -echo "configure:8265: checking for struct text_info" >&5 +echo "configure:8213: checking for struct text_info" >&5 cat > conftest.$ac_ext <<EOF -#line 8267 "configure" +#line 8215 "configure" #include "confdefs.h" int main() { struct text_info w; w.screenwidth=0; ; return 0; } EOF -if { (eval echo configure:8274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STRUCT_TEXT_INFO 1 @@ -8286,16 +8234,16 @@ fi rm -f conftest* echo $ac_n "checking for TIOCGWINSZ""... $ac_c" 1>&6 -echo "configure:8290: checking for TIOCGWINSZ" >&5 +echo "configure:8238: checking for TIOCGWINSZ" >&5 cat > conftest.$ac_ext <<EOF -#line 8292 "configure" +#line 8240 "configure" #include "confdefs.h" #include <sys/ioctl.h> int main() { int w=TIOCGWINSZ; ; return 0; } EOF -if { (eval echo configure:8299: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8247: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TIOCGWINSZ 1 @@ -8311,16 +8259,16 @@ fi rm -f conftest* echo $ac_n "checking for TIOCGGETD""... $ac_c" 1>&6 -echo "configure:8315: checking for TIOCGGETD" >&5 +echo "configure:8263: checking for TIOCGGETD" >&5 cat > conftest.$ac_ext <<EOF -#line 8317 "configure" +#line 8265 "configure" #include "confdefs.h" #include <sys/ioctl.h> int main() { int w=TIOCGETD; ; return 0; } EOF -if { (eval echo configure:8324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TIOCGETD 1 @@ -8339,12 +8287,12 @@ rm -f conftest* for ac_func in getpwuid gethostname system getrusage fork waitpid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8343: checking for $ac_func" >&5 +echo "configure:8291: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8348 "configure" +#line 8296 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8367,7 +8315,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:8371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8394,12 +8342,12 @@ done for ac_func in gettimeofday BSDgettimeofday difftime snprintf vsnprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8398: checking for $ac_func" >&5 +echo "configure:8346: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8403 "configure" +#line 8351 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8422,7 +8370,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:8426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8449,12 +8397,12 @@ done for ac_func in compress2 setsysinfo longjmp signal sigaction do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8453: checking for $ac_func" >&5 +echo "configure:8401: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8458 "configure" +#line 8406 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8477,7 +8425,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:8481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8502,24 +8450,24 @@ fi done cat > conftest.$ac_ext <<EOF -#line 8506 "configure" +#line 8454 "configure" #include "confdefs.h" #include<sys/types.h> int main() { off64_t n = 0; ; return 0; } EOF -if { (eval echo configure:8513: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8461: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* for ac_func in lseek64 fseek64 do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8518: checking for $ac_func" >&5 +echo "configure:8466: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8523 "configure" +#line 8471 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8542,7 +8490,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:8546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8575,14 +8523,13 @@ fi rm -f conftest* - echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:8581: checking for working const" >&5 +echo "configure:8528: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8586 "configure" +#line 8533 "configure" #include "confdefs.h" int main() { @@ -8631,7 +8578,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:8635: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -8652,21 +8599,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:8656: checking for inline" >&5 +echo "configure:8603: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 8663 "configure" +#line 8610 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:8670: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8617: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -8693,22 +8640,22 @@ esac echo $ac_n "checking for __attribute__ extension""... $ac_c" 1>&6 -echo "configure:8697: checking for __attribute__ extension" >&5 +echo "configure:8644: checking for __attribute__ extension" >&5 cat > conftest.$ac_ext <<EOF -#line 8699 "configure" +#line 8646 "configure" #include "confdefs.h" int main() { int __attribute__((unused)) x ; return 0; } EOF -if { (eval echo configure:8706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_ATTRIBUTE 1 EOF - echo "$ac_t""yes" 1>&6 + echo "$ac_t""yes" 1>&6 else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -8718,22 +8665,22 @@ fi rm -f conftest* echo $ac_n "checking for __FUNCTION__ extension""... $ac_c" 1>&6 -echo "configure:8722: checking for __FUNCTION__ extension" >&5 +echo "configure:8669: checking for __FUNCTION__ extension" >&5 cat > conftest.$ac_ext <<EOF -#line 8724 "configure" +#line 8671 "configure" #include "confdefs.h" int main() { (void)__FUNCTION__ ; return 0; } EOF -if { (eval echo configure:8731: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8678: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_FUNCTION 1 EOF - echo "$ac_t""yes" 1>&6 + echo "$ac_t""yes" 1>&6 else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -8743,29 +8690,35 @@ fi rm -f conftest* echo $ac_n "checking how to print long long""... $ac_c" 1>&6 -echo "configure:8747: checking how to print long long" >&5 +echo "configure:8694: checking how to print long long" >&5 if eval "test \"`echo '$''{'hdf5_cv_printf_ll'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else LD_LIBRARY_PATH="$LD_LIBRARY_PATH`echo $LDFLAGS | sed -e 's/-L/:/g' -e 's/ //g'`" export LD_LIBRARY_PATH - for hdf5_cv_printf_ll in l L q ll unknown; do - if test "$cross_compiling" = yes; then + +for hdf5_cv_printf_ll in l L q ll unknown; do + if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 8758 "configure" +#line 8706 "configure" #include "confdefs.h" #include <stdio.h> #include <stdlib.h> #include <string.h> - main() {char *s=malloc(128); - long long x = (long long)1048576 * (long long)1048576; - sprintf(s,"%${hdf5_cv_printf_ll}d",x); - exit (strcmp(s,"1099511627776"));} + +int main(void) +{ + char *s=malloc(128); + long long x = (long long)1048576 * (long long)1048576; + sprintf(s,"%${hdf5_cv_printf_ll}d",x); + exit(strcmp(s,"1099511627776")); +} + EOF -if { (eval echo configure:8769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then break else @@ -8775,9 +8728,10 @@ fi rm -fr conftest* fi - done +done fi + echo "$ac_t""%${hdf5_cv_printf_ll}d and %${hdf5_cv_printf_ll}u" 1>&6 cat >> confdefs.h <<EOF #define PRINTF_LL_WIDTH "$hdf5_cv_printf_ll" @@ -8785,7 +8739,7 @@ EOF echo $ac_n "checking for debug flags""... $ac_c" 1>&6 -echo "configure:8789: checking for debug flags" >&5 +echo "configure:8743: checking for debug flags" >&5 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then enableval="$enable_debug" @@ -8795,35 +8749,35 @@ fi all_packages="ac,b,d,e,f,g,hg,hl,i,mf,mm,o,p,s,t,v,z" -case X-$DEBUG_PKG in - X-|X-yes) - DEBUG_PKG="d,e,f,g,hg,i,mm,o,p,s,t,v,z" - CPPFLAGS="$CPPFLAGS -UNDEBUG" - echo "$ac_t""default ($DEBUG_PKG)" 1>&6 - ;; - X-all) - DEBUG_PKG=$all_packages - CPPFLAGS="$CPPFLAGS -UNDEBUG" - echo "$ac_t""all ($DEBUG_PKG)" 1>&6 - ;; - X-no|X-none) - echo "$ac_t""none" 1>&6 - DEBUG_PKG= - CPPFLAGS="$CPPFLAGS -DNDEBUG" - ;; - *) - echo "$ac_t""$DEBUG_PKG" 1>&6 - ;; +case "X-$DEBUG_PKG" in + X-|X-yes) + DEBUG_PKG="d,e,f,g,hg,i,mm,o,p,s,t,v,z" + CPPFLAGS="$CPPFLAGS -UNDEBUG" + echo "$ac_t""default ($DEBUG_PKG)" 1>&6 + ;; + X-all) + DEBUG_PKG=$all_packages + CPPFLAGS="$CPPFLAGS -UNDEBUG" + echo "$ac_t""all ($DEBUG_PKG)" 1>&6 + ;; + X-no|X-none) + echo "$ac_t""none" 1>&6 + DEBUG_PKG= + CPPFLAGS="$CPPFLAGS -DNDEBUG" + ;; + *) + echo "$ac_t""$DEBUG_PKG" 1>&6 + ;; esac -if test "X" != "X$DEBUG_PKG"; then +if test -n "$DEBUG_PKG"; then for pkg in `echo $DEBUG_PKG | tr 'a-z,' 'A-Z '`; do CPPFLAGS="$CPPFLAGS -DH5${pkg}_DEBUG" done fi echo $ac_n "checking for API tracing""... $ac_c" 1>&6 -echo "configure:8827: checking for API tracing" >&5; +echo "configure:8781: checking for API tracing" >&5; # Check whether --enable-trace or --disable-trace was given. if test "${enable_trace+set}" = set; then enableval="$enable_trace" @@ -8832,7 +8786,7 @@ fi -if test X = "X$TRACE" -o Xyes = "X$TRACE"; then +if test -z "$TRACE" -o "X$TRACE" = "Xyes"; then echo "$ac_t""yes" 1>&6 TRACE_API=yes CPPFLAGS="$CPPFLAGS -DH5_DEBUG_API" @@ -8896,46 +8850,39 @@ rm -f confcache case "$CC_BASENAME" in - mpicc) - # The mpich compiler. Use mpirun from the same directory if it - # exists. - PARALLEL=mpicc - echo $ac_n "checking for mpirun""... $ac_c" 1>&6 -echo "configure:8905: checking for mpirun" >&5 - - # Find the path where mpicc is located. - cmd=`echo $CC |cut -f1 -d' '` - if (echo $cmd |grep / >/dev/null); then - path="`echo $cmd |sed 's/\(.*\)\/.*$/\1/'`" - else - for path in `echo $PATH |tr : ' '`; do - if test -x $path/$cmd; then - break; - fi - done - fi + mpicc) + PARALLEL=mpicc + echo $ac_n "checking for mpirun""... $ac_c" 1>&6 +echo "configure:8857: checking for mpirun" >&5 + + cmd=`echo $CC |cut -f1 -d' '` + if (echo $cmd |grep / >/dev/null); then + path="`echo $cmd |sed 's/\(.*\)\/.*$/\1/'`" + else + for path in `echo $PATH |tr : ' '`; do + if test -x $path/$cmd; then + break; + fi + done + fi - # Is there an mpirun at that path? - if test -x $path/mpirun; then - echo "$ac_t""$path/mpirun" 1>&6 - RUNSERIAL="${RUNSERIAL:-none}" - if test "X-" = "X-$RUNPARALLEL"; then - RUNPARALLEL="$path/mpirun -np \$\${NPROCS:=2}" - fi - else - echo "$ac_t""none" 1>&6 - fi - ;; - - mpcc|mpcc_r) - # The IBM compiler - PARALLEL="$CC_BASENAME" - ;; + if test -x $path/mpirun; then + echo "$ac_t""$path/mpirun" 1>&6 + RUNSERIAL="${RUNSERIAL:-none}" + if test -z "$RUNPARALLEL"; then + RUNPARALLEL="$path/mpirun -np \$\${NPROCS:=2}" + fi + else + echo "$ac_t""none" 1>&6 + fi + ;; - *) - # Probably not a parallel compiler, but if `--enable-parallel' - # is defined below then we're still building a parallel hdf5. - ;; + mpcc|mpcc_r) + PARALLEL="$CC_BASENAME" + ;; + + *) + ;; esac # Check whether --enable-parallel or --disable-parallel was given. @@ -8946,38 +8893,32 @@ fi echo $ac_n "checking for parallel support files""... $ac_c" 1>&6 -echo "configure:8950: checking for parallel support files" >&5 +echo "configure:8897: checking for parallel support files" >&5 case "X-$enable_parallel" in - X-|X-no|X-none) - # Either we are not compiling for parallel or the header and library - # files and locations are known to the compiler (this is the case - # for a correct installation of mpicc for instance). - echo "$ac_t""skipped" 1>&6 - ;; + X-|X-no|X-none) + echo "$ac_t""skipped" 1>&6 + ;; - X-yes) - # We want to compile a parallel library with a compiler that - # may already know how to link with MPI and MPI-IO. - echo "$ac_t""provided by compiler" 1>&6 - PARALLEL=yes + X-yes) + echo "$ac_t""provided by compiler" 1>&6 + PARALLEL=yes - # Try link a simple MPI program. If fail, try again with -lmpi. - cat > conftest.$ac_ext <<EOF -#line 8967 "configure" + cat > conftest.$ac_ext <<EOF +#line 8908 "configure" #include "confdefs.h" int main() { MPI_Init() ; return 0; } EOF -if { (eval echo configure:8974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* echo $ac_n "checking for MPI_Init in -lmpi""... $ac_c" 1>&6 -echo "configure:8981: checking for MPI_Init in -lmpi" >&5 +echo "configure:8922: checking for MPI_Init in -lmpi" >&5 ac_lib_var=`echo mpi'_'MPI_Init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8985,7 +8926,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmpi $LIBS" cat > conftest.$ac_ext <<EOF -#line 8989 "configure" +#line 8930 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8996,7 +8937,7 @@ int main() { MPI_Init() ; return 0; } EOF -if { (eval echo configure:9000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9027,25 +8968,23 @@ fi fi rm -f conftest* - # Then try link a simple MPI-IO program. If fail, try again with - # -lmpio. - if test "yes" = "$PARALLEL"; then - cat > conftest.$ac_ext <<EOF -#line 9035 "configure" + if test "X$PARALLEL" = "Xyes"; then + cat > conftest.$ac_ext <<EOF +#line 8974 "configure" #include "confdefs.h" int main() { MPI_File_open() ; return 0; } EOF -if { (eval echo configure:9042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* echo $ac_n "checking for MPI_File_open in -lmpio""... $ac_c" 1>&6 -echo "configure:9049: checking for MPI_File_open in -lmpio" >&5 +echo "configure:8988: checking for MPI_File_open in -lmpio" >&5 ac_lib_var=`echo mpio'_'MPI_File_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9053,7 +8992,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmpio $LIBS" cat > conftest.$ac_ext <<EOF -#line 9057 "configure" +#line 8996 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9064,7 +9003,7 @@ int main() { MPI_File_open() ; return 0; } EOF -if { (eval echo configure:9068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9094,30 +9033,20 @@ fi fi rm -f conftest* - fi + fi - # Set RUNPARALLEL to mpirun if not set yet. - if test "yes" = "$PARALLEL" -a "X-" = "X-$RUNPARALLEL"; then - RUNPARALLEL="mpirun -np \$\${NPROCS:=2}" - fi - ;; - - X-mpich) - # For normal mpich installation the compiler, mpicc, should know - # where the MPI and MPI-IO header files are located and know which - # extra libraries need to be linked and will supply appropriate - # flags to the underlying compiler. - echo "$ac_t""mpich" 1>&6 - echo "configure: warning: *** Why aren't you using an mpicc compiler? ***" 1>&2 - - # Apparently mpicc isn't installed correctly so configure must search - # for the header files and libraries. Actually we only have to search - # for the libraries in order to get the onto the link line, the user - # will have already told us about the locations. Fail if something - # is missing. - PARALLEL=mpich - echo $ac_n "checking for MPI_Init in -lmpich""... $ac_c" 1>&6 -echo "configure:9121: checking for MPI_Init in -lmpich" >&5 + if test "X$PARALLEL" = "Xyes" -a -z "$RUNPARALLEL"; then + RUNPARALLEL="mpirun -np \$\${NPROCS:=2}" + fi + ;; + + X-mpich) + echo "$ac_t""mpich" 1>&6 + echo "configure: warning: *** Why aren't you using an mpicc compiler? ***" 1>&2 + + PARALLEL=mpich + echo $ac_n "checking for MPI_Init in -lmpich""... $ac_c" 1>&6 +echo "configure:9050: checking for MPI_Init in -lmpich" >&5 ac_lib_var=`echo mpich'_'MPI_Init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9125,7 +9054,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmpich $LIBS" cat > conftest.$ac_ext <<EOF -#line 9129 "configure" +#line 9058 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9136,7 +9065,7 @@ int main() { MPI_Init() ; return 0; } EOF -if { (eval echo configure:9140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9164,45 +9093,42 @@ else { echo "configure: error: no mpich library" 1>&2; exit 1; } fi - ;; + ;; *) - echo "$ac_t""error" 1>&6 - { echo "configure: error: \"$enable_parallel\" is not a valid parallel search type" 1>&2; exit 1; } - ;; + echo "$ac_t""error" 1>&6 + { echo "configure: error: \'$enable_parallel\' is not a valid parallel search type" 1>&2; exit 1; } + ;; esac -if test "X-" != "X-$PARALLEL"; then - TESTPARALLEL=testpar +if test -n "$PARALLEL"; then + TESTPARALLEL=testpar fi -if test "X-" != "X-$PARALLEL"; then - # We are building a parallel library - cat >> confdefs.h <<\EOF +if test -n "$PARALLEL"; then + cat >> confdefs.h <<\EOF #define HAVE_PARALLEL 1 EOF - # Display what we found about running programs - echo $ac_n "checking prefix for running on one processor""... $ac_c" 1>&6 -echo "configure:9189: checking prefix for running on one processor" >&5 - echo "$ac_t""$RUNSERIAL" 1>&6 - echo $ac_n "checking prefix for running in parallel""... $ac_c" 1>&6 -echo "configure:9192: checking prefix for running in parallel" >&5 - echo "$ac_t""$RUNPARALLEL" 1>&6 + echo $ac_n "checking prefix for running on one processor""... $ac_c" 1>&6 +echo "configure:9116: checking prefix for running on one processor" >&5 + echo "$ac_t""$RUNSERIAL" 1>&6 + echo $ac_n "checking prefix for running in parallel""... $ac_c" 1>&6 +echo "configure:9119: checking prefix for running in parallel" >&5 + echo "$ac_t""$RUNPARALLEL" 1>&6 - # Check that we can link a simple MPI and MPI-IO application - echo $ac_n "checking whether a simple MPI-IO program can be linked""... $ac_c" 1>&6 -echo "configure:9197: checking whether a simple MPI-IO program can be linked" >&5 - cat > conftest.$ac_ext <<EOF -#line 9199 "configure" + echo $ac_n "checking whether a simple MPI-IO program can be linked""... $ac_c" 1>&6 +echo "configure:9123: checking whether a simple MPI-IO program can be linked" >&5 + cat > conftest.$ac_ext <<EOF +#line 9125 "configure" #include "confdefs.h" int main() { MPI_Init();MPI_File_open(); ; return 0; } EOF -if { (eval echo configure:9206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -9210,58 +9136,42 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* echo "$ac_t""no" 1>&6 - { echo "configure: error: 'unable to link a simple MPI-IO application'" 1>&2; exit 1; } + { echo "configure: error: 'unable to link a simple MPI-IO application'" 1>&2; exit 1; } fi rm -f conftest* + if test -z "$RUNPARALLEL"; then + { echo "configure: error: no way to run a parallel program" 1>&2; exit 1; } + fi - # There *must* be some way to run in parallel even if it's just the - # word `none'. - if test "X-" = "X-$RUNPARALLEL"; then - { echo "configure: error: no way to run a parallel program" 1>&2; exit 1; } - fi - - # If RUNSERIAL or RUNPARALLEL is the word `none' then replace it with - # the empty string. - if test "X-none" = "X-$RUNSERIAL"; then - RUNSERIAL= - fi - if test "X-none" = "X-$RUNPARALLEL"; then - RUNPARALLEL= - fi + if test "X$RUNSERIAL" = "Xnone"; then + RUNSERIAL= + fi + if test "X$RUNPARALLEL" = "Xnone"; then + RUNPARALLEL= + fi fi -# HDF5 version from the first line of the README file. H5_VERSION=`cut -d' ' -f3 $srcdir/README |head -1` -# Configuration date CONFIG_DATE=`date` -# User doing the configuration CONFIG_USER="`whoami`@`hostname`" -if test "X-$ORGANIZATION" != "X-"; then - CONFIG_USER="$CONFIG_USER at $ORGANIZATION" +if test -n "$ORGANIZATION"; then + CONFIG_USER="$CONFIG_USER at $ORGANIZATION" fi -# Configuration mode (production, development, profile, etc) saved above. -# Byte sex from the AC_C_BIGENDIAN macro. -if test $ac_cv_c_bigendian = yes; then - BYTESEX="big-endian" +if test "X$ac_cv_c_bigendian" = "Xyes"; then + BYTESEX="big-endian" else - BYTESEX="little-endian" + BYTESEX="little-endian" fi -# Are we compiling static libraries, shared libraries, or both? This is only -# used for the libhdf5.settings file. We can't just look at $enable_static and -# $enable_shared because if they're yes the ltconfig might have decided that -# one or the other is simply not possible. Therefore we have to look in the -# generated `libtool' shell script for lines that set the value of -# `build_libtool_libs' (shared) and `build_old_libs' (static). if (grep '^build_libtool_libs=yes' libtool >/dev/null); then enable_shared=yes @@ -9273,54 +9183,69 @@ if (grep '^build_old_libs=yes' libtool >/dev/null); then else enable_static=no fi -if test $enable_static = yes && test $enable_shared = yes; then +if test "X$enable_static" = "Xyes" && test "X$enable_shared" = "Xyes"; then STATIC_SHARED="static, shared" -elif test $enable_static = yes; then +elif test "X$enable_static" = "Xyes"; then STATIC_SHARED="static" -elif test $enable_shared = yes; then +elif test "X$enable_shared" = "Xyes"; then STATIC_SHARED="shared" else STATIC_SHARED="none" fi -# Parallel support? (set above except empty if none) PARALLEL=${PARALLEL:-no} -# Compiler with version information -if test "X-$cc_vendor" != "X-" && test "X-$cc_version" != "X-"; then - CC_VERSION="$CC ($cc_vendor-$cc_version)" +if test -n "$cc_vendor" && test -n "$cc_version"; then + CC_VERSION="$CC ($cc_vendor-$cc_version)" else - # If $CC contains directory component, take it as is; - # else search it among PATH components. - if `echo $CC | grep / 2>&1 /dev/null`; then - CC_VERSION="$CC" - else - for x in `echo $PATH | sed -e 's/:/ /g'`; do - if test -x $x/$CC; then - CC_VERSION="$x/$CC" - break - fi - done - fi + if `echo $CC | grep / 2>&1 /dev/null`; then + CC_VERSION="$CC" + else + for x in `echo $PATH | sed -e 's/:/ /g'`; do + if test -x $x/$CC; then + CC_VERSION="$x/$CC" + break + fi + done + fi fi +if test -x /bin/pwd; then + pwd=/bin/pwd +else + pwd=pwd +fi + ROOT=`$pwd` + DYNAMIC_DIRS="" -if test -n $LDFLAGS; then +if test -n "$LDFLAGS"; then for d in $LDFLAGS ; do - d=`echo $d | sed -e 's/-L/-R/g'` - - case "$d" in + d=`echo $d | sed -e 's/-L//g'` + case "$d" in .*) - d=`pwd`/$d + d=${ROOT}/$d ;; esac - - DYNAMIC_DIRS="$d $DYNAMIC_DIRS" + DYNAMIC_DIRS="-R${d} $DYNAMIC_DIRS" done fi +if test -n "$CPPFLAGS"; then + TEMP_CPPFLAGS="" + for d in $CPPFLAGS ; do + case "$d" in + -I.*) + d=`echo $d | sed -e 's/-I//g'` + d=-I${ROOT}/${d} + ;; + esac + TEMP_CPPFLAGS="$d $TEMP_CPPFLAGS" + done + CPPFLAGS=$TEMP_CPPFLAGS +fi + COMMENCE=config/commence CONCLUDE=config/conclude @@ -9334,13 +9259,6 @@ else SETX="set -x" fi -if test -x /bin/pwd; then - pwd=/bin/pwd -else - pwd=pwd -fi - ROOT=`$pwd` - rm -f conftest conftest.o conftest.c dummy.o @@ -9534,6 +9452,7 @@ s%@CONFIG_MODE@%$CONFIG_MODE%g s%@BYTESEX@%$BYTESEX%g s%@STATIC_SHARED@%$STATIC_SHARED%g s%@CC_VERSION@%$CC_VERSION%g +s%@ROOT@%$ROOT%g s%@DYNAMIC_DIRS@%$DYNAMIC_DIRS%g /@COMMENCE@/r $COMMENCE s%@COMMENCE@%%g @@ -9541,7 +9460,6 @@ s%@COMMENCE@%%g s%@CONCLUDE@%%g s%@SEARCH@%$SEARCH%g s%@SETX@%$SETX%g -s%@ROOT@%$ROOT%g CEOF EOF @@ -9760,17 +9678,17 @@ cat >> $CONFIG_STATUS <<EOF EOF cat >> $CONFIG_STATUS <<\EOF - echo "creating src/H5pubconf.h" - sed 's/#define /#define H5_/' <src/H5config.h |\ - sed 's/#undef /#undef H5_/' >pubconf - if test ! -f src/H5pubconf.h; then - /bin/mv -f pubconf src/H5pubconf.h - elif (diff pubconf src/H5pubconf.h >/dev/null); then - /bin/rm -f pubconf - echo "src/H5pubconf.h is unchanged" - else - /bin/mv -f pubconf src/H5pubconf.h - fi + echo "creating src/H5pubconf.h" + sed 's/#define /#define H5_/' <src/H5config.h |\ + sed 's/#undef /#undef H5_/' >pubconf + if test ! -f src/H5pubconf.h; then + /bin/mv -f pubconf src/H5pubconf.h + elif (diff pubconf src/H5pubconf.h >/dev/null); then + /bin/rm -f pubconf + echo "src/H5pubconf.h is unchanged" + else + /bin/mv -f pubconf src/H5pubconf.h + fi exit 0 @@ -9893,9 +9811,9 @@ cat >> src/H5config.h <<EOF EOF if (grep __cplusplus src H5pubconf.h) >/dev/null 2>&1; then - : + : else - cat >> src/H5pubconf.h <<EOF + cat >> src/H5pubconf.h <<EOF /* inline is a keyword in C++. If this is a C++ compiler, undefine it */ #if defined(__cplusplus) && defined(inline) diff --git a/configure.in b/configure.in index abd1365..c5fcf6f 100644 --- a/configure.in +++ b/configure.in @@ -10,17 +10,17 @@ AC_REVISION($Id$) AC_INIT(src/H5.c) AC_CONFIG_HEADER(src/H5config.h) AC_OUTPUT_COMMANDS([ - echo "creating src/H5pubconf.h" - sed 's/#define /#define H5_/' <src/H5config.h |\ - sed 's/#undef /#undef H5_/' >pubconf - if test ! -f src/H5pubconf.h; then - /bin/mv -f pubconf src/H5pubconf.h - elif (diff pubconf src/H5pubconf.h >/dev/null); then - /bin/rm -f pubconf - echo "src/H5pubconf.h is unchanged" - else - /bin/mv -f pubconf src/H5pubconf.h - fi + echo "creating src/H5pubconf.h" + sed 's/#define /#define H5_/' <src/H5config.h |\ + sed 's/#undef /#undef H5_/' >pubconf + if test ! -f src/H5pubconf.h; then + /bin/mv -f pubconf src/H5pubconf.h + elif (diff pubconf src/H5pubconf.h >/dev/null); then + /bin/rm -f pubconf + echo "src/H5pubconf.h is unchanged" + else + /bin/mv -f pubconf src/H5pubconf.h + fi ]) AC_CONFIG_AUX_DIR(bin) AC_CANONICAL_HOST @@ -63,27 +63,27 @@ dnl dnl If the `OS' ends with a version number then remove it. For instance, dnl `freebsd3.1' would become `freebsd' case $host_os in - aix4.*) - host_os_novers=aix4.x - ;; - freebsd*) - host_os_novers=freebsd - ;; - irix5.*) - host_os_novers=irix5.x - ;; - irix6.*) - host_os_novers=irix6.x - ;; - osf4.*) - host_os_novers=osf4.x - ;; - solaris2.*) - host_os_novers=solaris2.x - ;; - *) - host_os_novers=$host_os - ;; + aix4.*) + host_os_novers=aix4.x + ;; + freebsd*) + host_os_novers=freebsd + ;; + irix5.*) + host_os_novers=irix5.x + ;; + irix6.*) + host_os_novers=irix6.x + ;; + osf4.*) + host_os_novers=osf4.x + ;; + solaris2.*) + host_os_novers=solaris2.x + ;; + *) + host_os_novers=$host_os + ;; esac host_config="none" @@ -127,13 +127,12 @@ AC_ARG_ENABLE(fortran, [ --enable-fortran Compile the Fortran interface [default=no]], HDF_FORTRAN=$enableval) -if test "X$HDF_FORTRAN" = Xyes; then +if test "X$HDF_FORTRAN" = "Xyes"; then echo "yes" - if test -z $config_dirs; then - config_dirs=fortran + config_dirs=fortran else - config_dirs=${config_dirs} fortran + config_dirs=${config_dirs} fortran fi else echo "no" @@ -147,13 +146,12 @@ AC_ARG_ENABLE(c++, [ --enable-c++ Compile the C++ interface [default=no]], HDF_CXX=$enableval) -if test "X$HDF_CXX" = Xyes; then +if test "X$HDF_CXX" = "Xyes"; then echo "yes" - if test -z $config_dirs; then - config_dirs=c++ + config_dirs=c++ else - config_dirs=${config_dirs} c++ + config_dirs=${config_dirs} c++ fi else echo "no" @@ -171,17 +169,16 @@ dnl If we should build only static executables dnl AC_MSG_CHECKING(if should build only statically linked executables) AC_ARG_ENABLE(static_exec, - [ --enable-static-exec Build only statically linked executables [default=no]], - STATIC_EXEC=$enableval) + [ --enable-static-exec Build only statically linked executables [default=no]], + STATIC_EXEC=$enableval) -if test "X$STATIC_EXEC" = Xyes; then +if test "X$STATIC_EXEC" = "Xyes"; then echo "yes" LT_STATIC_EXEC="-all-static" else echo "no" LT_STATIC_EXEC="" fi - AC_SUBST(LT_STATIC_EXEC) if test "X$AR" = "X"; then @@ -192,63 +189,63 @@ AC_SUBST(AR) AC_MSG_CHECKING(make) AC_SUBST_FILE(DEPEND) if test "`${MAKE-make} --version -f /dev/null 2>/dev/null |\ - sed -n 1p|cut -c1-8`" = "GNU Make"; then - AC_MSG_RESULT(GNU make) - GMAKE=yes - if test "X$GCC" = "Xyes"; then - DEPEND=config/depend1 - else - DEPEND=config/depend2 - fi + sed -n 1p|cut -c1-8`" = "GNU Make"; then + AC_MSG_RESULT(GNU make) + GMAKE=yes + if test "X$GCC" = "Xyes"; then + DEPEND=config/depend1 + else + DEPEND=config/depend2 + fi else - AC_MSG_RESULT(generic) + AC_MSG_RESULT(generic) fi dnl How do we include another file into a Makefile? -if test "X" = "X$DEPEND"; then - AC_MSG_CHECKING(how to include a makefile) +if test -z "$DEPEND"; then + AC_MSG_CHECKING(how to include a makefile) - dnl The include file contains the target for `foo' - cat >makeinc <<EOF + dnl The include file contains the target for `foo' + cat >makeinc <<EOF foo: @: EOF - while true; do #for break - - dnl pmake. We have to be careful because some pmake think that the - dnl contents of the MAKE environment variable is a target. - echo '.include <makeinc>' >maketest - if (MAKE= ${MAKE-make} -f maketest foo) >/dev/null 2>&1; then - AC_MSG_RESULT([.include <FILE>]) - DEPEND=config/depend3 - break - fi - - dnl Most make's use `include FILE' - echo 'include makeinc' >maketest - if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then - AC_MSG_RESULT(include FILE) - DEPEND=config/depend4 - break; - fi - - dnl default - AC_MSG_RESULT(you have a deficient make command) - DEPEND=config/dependN - break - done - rm makeinc maketest + while true; do #for break + dnl pmake. We have to be careful because some pmake think that the + dnl contents of the MAKE environment variable is a target. + echo '.include <makeinc>' >maketest + if (MAKE= ${MAKE-make} -f maketest foo) >/dev/null 2>&1; then + AC_MSG_RESULT([.include <FILE>]) + DEPEND=config/depend3 + break + fi + + dnl Most make's use `include FILE' + echo 'include makeinc' >maketest + if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then + AC_MSG_RESULT(include FILE) + DEPEND=config/depend4 + break; + fi + + dnl default + AC_MSG_RESULT(you have a deficient make command) + DEPEND=config/dependN + break + done + rm makeinc maketest fi +dnl ---------------------------------------------------------------------- dnl Sometimes makes think the `.PATH:' appearing before the first rule dnl with an action should override the `all' default target. So we have dnl to decide what the proper syntax is. dnl AC_MSG_CHECKING(how make searches directories) while true; do #for break - # The most common method is `VPATH=DIR1 DIR2 ...' - cat >maketest <<EOF + # The most common method is `VPATH=DIR1 DIR2 ...' + cat >maketest <<EOF VPATH=$srcdir/config $srcdir/src $srcdir/bin .c.o: cp $< H5.o @@ -257,16 +254,16 @@ foo: H5.o /bin/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 + if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then + SEARCH_RULE='VPATH=' + SEARCH_SEP=' ' + AC_MSG_RESULT([VPATH=DIR1 DIR2 ...]) + break + fi + + dnl The second most common method is like above except with the + dnl directories separated by colons. + cat >maketest <<EOF VPATH=$srcdir/config:$srcdir/src:$srcdir/bin .c.o: cp $< H5.o @@ -275,15 +272,15 @@ foo: H5.o /bin/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 + if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then + SEARCH_RULE='VPATH=' + SEARCH_SEP=':' + AC_MSG_RESULT([VPATH=DIR1:DIR2:...]) + break + fi + + dnl pmake uses the construct `.PATH: DIR1 DIR2 + cat >maketest <<EOF .PATH: $srcdir/config $srcdir/src $srcdir/bin .c.o: cp $< H5.o @@ -292,28 +289,28 @@ foo: H5.o /bin/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 + 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 + + dnl 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 dnl ---------------------------------------------------------------------- dnl Turn on warning flags for gcc. dnl -if test Xyes = "X$GCC"; then +if test "X$GCC" = "Xyes"; then CFLAGS="$CFLAGS -Wall -W -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline" fi @@ -369,14 +366,14 @@ AC_CHECK_HEADERS(stdint.h, C9x=yes) dnl Windows AC_CHECK_HEADERS(io.h winsock.h sys/timeb.h) -case $host in - alpha*-dec*-osf*) - dnl The <sys/sysinfo.h> and <sys/proc.h> are needed on the DEC - dnl Alpha to turn off UAC fixing. We do *not* attempt to - dnl locate these files on other systems because there are too - dnl many problems with including them. - AC_CHECK_HEADERS(sys/sysinfo.h sys/proc.h) - ;; +case "$host" in + alpha*-dec*-osf*) + dnl The <sys/sysinfo.h> and <sys/proc.h> are needed on the DEC + dnl Alpha to turn off UAC fixing. We do *not* attempt to + dnl locate these files on other systems because there are too + dnl many problems with including them. + AC_CHECK_HEADERS(sys/sysinfo.h sys/proc.h) + ;; esac dnl ---------------------------------------------------------------------- @@ -403,8 +400,9 @@ dnl Posix.1g types (C9x) cat >>confdefs.h <<\EOF #include <sys/types.h> EOF -if test "Xyes" = "X$C9x"; then - cat >>confdefs.h <<\EOF + +if test "X$C9x" = "Xyes"; then + cat >>confdefs.h <<\EOF #include <stdint.h> EOF fi @@ -444,25 +442,26 @@ EOF AC_CHECK_SIZEOF(off_t, 4) AC_ARG_ENABLE(hsizet, - [ --disable-hsizet Datasets can normally be larger than memory + [ --disable-hsizet Datasets can normally be larger than memory and/or files but some compilers are unable to handle this (including versions of GCC before 2.8.0). Disabling the feature causes dataset sizes to be restricted to the size of core memory, or 'size_t'.], HSIZET=$enableval) + AC_MSG_CHECKING(for sizeof hsize_t and hssize_t) AC_SUBST(HSIZET) case $HSIZET in - no|small) - AC_MSG_RESULT(small) - HSIZET=small - ;; - *) - AC_MSG_RESULT(large) - HSIZET=large - AC_DEFINE(HAVE_LARGE_HSIZET) - ;; + no|small) + AC_MSG_RESULT(small) + HSIZET=small + ;; + *) + AC_MSG_RESULT(large) + HSIZET=large + AC_DEFINE(HAVE_LARGE_HSIZET) + ;; esac dnl Checkpoint the cache @@ -473,57 +472,56 @@ dnl Is HDF4 present? If so then we can compile the h5toh4 converter. We dnl assume h5toh4 can be compiled and then prove otherwise when we don't find dnl a header file or library. dnl -AC_SUBST(H5TOH4) -H5TOH4=h5toh4 -AC_SUBST(TESTH5TOH4) -TESTH5TOH4='$(srcdir)/testh5toh4' +AC_SUBST(H5TOH4) H5TOH4=h5toh4 +AC_SUBST(TESTH5TOH4) TESTH5TOH4='$(srcdir)/testh5toh4' dnl NCSA keeps hdf4 in a funny place, but for most sites we don't want these. test -d /usr/ncsa/include && CPPFLAGS="$CPPFLAGS -I/usr/ncsa/include" test -d /usr/ncsa/lib && LDFLAGS="$LDFLAGS -L/usr/ncsa/lib" +FOUND_ZLIB="no" + AC_ARG_WITH(hdf4,[ --with-hdf4=INC,LIB Use the HDF4 library],,withval=yes) -case $withval in - yes) - AC_CHECK_HEADERS(mfhdf.h,,unset H5TOH4 TESTH5TOH4) - AC_CHECK_LIB(z,deflate,,unset H5TOH4 TESTH5TOH4) - AC_CHECK_LIB(jpeg,jpeg_start_compress,,unset H5TOH4 TESTH5TOH4) - AC_CHECK_LIB(df,Hstartaccess,,unset H5TOH4 TESTH5TOH4) - AC_CHECK_LIB(mfhdf,SDstart,,unset H5TOH4 TESTH5TOH4) - ;; - no) - AC_MSG_CHECKING(for HDF4) - AC_MSG_RESULT(suppressed) - unset H5TOH4 TESTH5TOH4 - ;; - *) - hdf4_inc="`echo $withval |cut -f1 -d,`" - if test "X" != "$hdf4_inc"; then - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$hdf4_inc" - AC_CHECK_HEADERS(mfhdf.h,, - CPPFLAGS="$saved_CPPFLAGS" - unset H5TOH4 TESTH5TOH4 - ) - else - AC_CHECK_HEADERS(mfhdf.h) - fi +case "$withval" in + yes) + AC_CHECK_HEADERS(mfhdf.h,,unset H5TOH4 TESTH5TOH4) + AC_CHECK_LIB(z,compress,FOUND_ZLIB="yes",unset H5TOH4 TESTH5TOH4) + AC_CHECK_LIB(jpeg,jpeg_start_compress,,unset H5TOH4 TESTH5TOH4) + AC_CHECK_LIB(df,Hstartaccess,,unset H5TOH4 TESTH5TOH4) + AC_CHECK_LIB(mfhdf,SDstart,,unset H5TOH4 TESTH5TOH4) + ;; + no) + AC_MSG_CHECKING(for HDF4) + AC_MSG_RESULT(suppressed) + unset H5TOH4 TESTH5TOH4 + ;; + *) + hdf4_inc="`echo $withval |cut -f1 -d,`" + if test -n "$hdf4_inc"; then + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I$hdf4_inc" + AC_CHECK_HEADERS(mfhdf.h,, + CPPFLAGS="$saved_CPPFLAGS" + unset H5TOH4 TESTH5TOH4) + else + AC_CHECK_HEADERS(mfhdf.h) + fi - hdf4_lib="`echo $withval |cut -f2 -d, -s`" - if test "X" != "$hdf4_lib"; then - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$hdf4_lib" - AC_CHECK_LIB(z,deflate,,unset H5TOH4 TESTH5TOH4) - AC_CHECK_LIB(jpeg,jpeg_start_compress,,unset H5TOH4 TESTH5TOH4) - AC_CHECK_LIB(df,Hstartaccess,,unset H5TOH4 TESTH5TOH4) - AC_CHECK_LIB(mfhdf,SDstart,,unset H5TOH4 TESTH5TOH4) - else - AC_CHECK_LIB(z,deflate,,unset H5TOH4 TESTH5TOH4) - AC_CHECK_LIB(jpeg,jpeg_start_compress,,unset H5TOH4 TESTH5TOH4) - AC_CHECK_LIB(df,Hstartaccess) - AC_CHECK_LIB(mfhdf,SDstart) - fi - ;; + hdf4_lib="`echo $withval |cut -f2 -d, -s`" + if test -n "$hdf4_lib"; then + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$hdf4_lib" + AC_CHECK_LIB(z,compress,FOUND_ZLIB="yes",unset H5TOH4 TESTH5TOH4) + AC_CHECK_LIB(jpeg,jpeg_start_compress,,unset H5TOH4 TESTH5TOH4) + AC_CHECK_LIB(df,Hstartaccess,,unset H5TOH4 TESTH5TOH4) + AC_CHECK_LIB(mfhdf,SDstart,,unset H5TOH4 TESTH5TOH4) + else + AC_CHECK_LIB(z,compress,FOUND_ZLIB="yes",unset H5TOH4 TESTH5TOH4) + AC_CHECK_LIB(jpeg,jpeg_start_compress,,unset H5TOH4 TESTH5TOH4) + AC_CHECK_LIB(df,Hstartaccess) + AC_CHECK_LIB(mfhdf,SDstart) + fi + ;; esac dnl ---------------------------------------------------------------------- @@ -532,49 +530,49 @@ dnl `-lz' and their locations might be specified with the `--enable-zlib' dnl command-line switch. The value is an include path and/or a library path. dnl If the library path is specified then it must be preceded by a comma. dnl - AC_ARG_WITH(zlib,[ --with-zlib=INC,LIB Use the GNU zlib compression], ,withval=yes) -case $withval in - yes) - AC_CHECK_HEADERS(zlib.h) - AC_CHECK_LIB(z, compress) - ;; - no) - AC_MSG_CHECKING(for GNU zlib) - AC_MSG_RESULT(suppressed) - ;; - *) - zlib_inc="`echo $withval |cut -f1 -d,`" - if test "X" != "$zlib_inc"; then - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$zlib_inc" - AC_CHECK_HEADERS(zlib.h,,CPPFLAGS="$saved_CPPFLAGS") - else - AC_CHECK_HEADERS(zlib.h) - fi - - zlib_lib="`echo $withval |cut -f2 -d, -s`" - if test "X" != "$zlib_lib"; then - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$zlib_lib" - AC_CHECK_LIB(z, compress,,LDFLAGS="$saved_LDFLAGS") - else - AC_CHECK_LIB(z, compress) - fi - ;; -esac +if test "X$FOUND_ZLIB" = "Xno"; then + dnl Only check for zlib if we haven't found it above in the HDF4 stuff. + case "$withval" in + yes) + AC_CHECK_HEADERS(zlib.h) + AC_CHECK_LIB(z, compress) + ;; + no) + AC_MSG_CHECKING(for GNU zlib) + AC_MSG_RESULT(suppressed) + ;; + *) + zlib_inc="`echo $withval |cut -f1 -d,`" + if test -n "$zlib_inc"; then + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I$zlib_inc" + AC_CHECK_HEADERS(zlib.h,,CPPFLAGS="$saved_CPPFLAGS") + else + AC_CHECK_HEADERS(zlib.h) + fi + + zlib_lib="`echo $withval |cut -f2 -d, -s`" + if test -n "$zlib_lib"; then + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$zlib_lib" + AC_CHECK_LIB(z,compress,,LDFLAGS="$saved_LDFLAGS") + else + AC_CHECK_LIB(z,compress) + fi + ;; + esac +fi dnl ---------------------------------------------------------------------- dnl Is SSL library present? It is needed by GLOBUS-GASS and Grid Storage dnl driver. dnl -AC_SUBST(SSL) -SSL=yes - +AC_SUBST(SSL) SSL=yes AC_ARG_WITH(ssl,[ --with-ssl=LIB Use SSL libs from LIB ],,) -if test "X-" != "X-$with_ssl"; then - LDFLAGS="$LDFLAGS -L$with_ssl" +if test -n "$with_ssl"; then + LDFLAGS="$LDFLAGS -L$with_ssl" fi AC_CHECK_LIB(crypto,main,,unset SSL) @@ -584,174 +582,175 @@ dnl ---------------------------------------------------------------------- dnl Is GLOBUS-GASS(1.1.0 or 1.1.1) Library present? It is also needed by dnl the Grid Storage driver. dnl -AC_SUBST(GASS) -GASS=yes -AC_SUBST(TESTGASS) -TESTGASS='$(srcdir)/testgass' - +AC_SUBST(GASS) GASS=yes +AC_SUBST(TESTGASS) TESTGASS='$(srcdir)/testgass' AC_ARG_WITH(gass,[ --with-gass=INC,LIB Use the GASS Library [default=no]], ,withval=no) -case $withval in - yes) - AC_CHECK_HEADERS(globus_common.h,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_common,globus_module_activate,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gass_cache,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gaa,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gss,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gss_assist,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_io,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gass_transfer_assist,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gass_transfer,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gass_file,globus_gass_open,,unset GASS TESTGASS) - ;; - no) - AC_MSG_CHECKING(for GASS) - AC_MSG_RESULT(suppressed) - unset GASS TESTGASS - ;; - *) - gass_inc="`echo $withval |cut -f1 -d,`" - if test "X" != "$gass_inc"; then - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$gass_inc" - AC_CHECK_HEADERS(globus_common.h,, - CPPFLAGS="$saved_CPPFLAGS" - unset GASS TESTGASS - ) - else - AC_CHECK_HEADERS(globus_common.h) - fi + +case "$withval" in + yes) + AC_CHECK_HEADERS(globus_common.h,,unset GASS TESTGASS) + AC_CHECK_LIB(globus_common,globus_module_activate,,unset GASS TESTGASS) + AC_CHECK_LIB(globus_gass_cache,main,,unset GASS TESTGASS) + AC_CHECK_LIB(globus_gaa,main,,unset GASS TESTGASS) + AC_CHECK_LIB(globus_gss,main,,unset GASS TESTGASS) + AC_CHECK_LIB(globus_gss_assist,main,,unset GASS TESTGASS) + AC_CHECK_LIB(globus_io,main,,unset GASS TESTGASS) + AC_CHECK_LIB(globus_gass_transfer_assist,main,,unset GASS TESTGASS) + AC_CHECK_LIB(globus_gass_transfer,main,,unset GASS TESTGASS) + AC_CHECK_LIB(globus_gass_file,globus_gass_open,,unset GASS TESTGASS) + ;; + no) + AC_MSG_CHECKING(for GASS) + AC_MSG_RESULT(suppressed) + unset GASS TESTGASS + ;; + *) + gass_inc="`echo $withval |cut -f1 -d,`" + if test -n "$gass_inc"; then + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I$gass_inc" + AC_CHECK_HEADERS(globus_common.h,, + CPPFLAGS="$saved_CPPFLAGS" + unset GASS TESTGASS) + else + AC_CHECK_HEADERS(globus_common.h) + fi - gass_lib="`echo $withval |cut -f2 -d, -s`" - if test "X" != "$gass_lib"; then - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$gass_lib" - AC_CHECK_LIB(globus_common,globus_module_activate,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gass_cache,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gaa,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gss,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gss_assist,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_io,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gass_transfer_assist,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gass_transfer,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gass_file,globus_gass_open,,unset GASS TESTGASS) - else - AC_CHECK_LIB(globus_common,globus_module_activate,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gass_cache,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gaa,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gss,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gss_assist,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_io,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gass_transfer_assist,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gass_transfer,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gass_file,globus_gass_open,,unset GASS TESTGASS) - fi - ;; + gass_lib="`echo $withval |cut -f2 -d, -s`" + if test -n "$gass_lib"; then + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$gass_lib" + AC_CHECK_LIB(globus_common,globus_module_activate,,unset GASS TESTGASS) + AC_CHECK_LIB(globus_gass_cache,main,,unset GASS TESTGASS) + AC_CHECK_LIB(globus_gaa,main,,unset GASS TESTGASS) + AC_CHECK_LIB(globus_gss,main,,unset GASS TESTGASS) + AC_CHECK_LIB(globus_gss_assist,main,,unset GASS TESTGASS) + AC_CHECK_LIB(globus_io,main,,unset GASS TESTGASS) + AC_CHECK_LIB(globus_gass_transfer_assist,main,,unset GASS TESTGASS) + AC_CHECK_LIB(globus_gass_transfer,main,,unset GASS TESTGASS) + AC_CHECK_LIB(globus_gass_file,globus_gass_open,,unset GASS TESTGASS) + else + AC_CHECK_LIB(globus_common,globus_module_activate,,unset GASS TESTGASS) + AC_CHECK_LIB(globus_gass_cache,main,,unset GASS TESTGASS) + AC_CHECK_LIB(globus_gaa,main,,unset GASS TESTGASS) + AC_CHECK_LIB(globus_gss,main,,unset GASS TESTGASS) + AC_CHECK_LIB(globus_gss_assist,main,,unset GASS TESTGASS) + AC_CHECK_LIB(globus_io,main,,unset GASS TESTGASS) + AC_CHECK_LIB(globus_gass_transfer_assist,main,,unset GASS TESTGASS) + AC_CHECK_LIB(globus_gass_transfer,main,,unset GASS TESTGASS) + AC_CHECK_LIB(globus_gass_file,globus_gass_open,,unset GASS TESTGASS) + fi + ;; esac -if test "X-" != "X-$GASS"; then - AC_DEFINE(HAVE_GASS) + +if test -n "$GASS"; then + AC_DEFINE(HAVE_GASS) fi dnl ---------------------------------------------------------------------- dnl Are SRB Client and other system libraries(socket, elf) present? dnl -AC_SUBST(SRB) -SRB=yes -AC_SUBST(TESTSRB) -TESTSRB='$(srcdir)/testsrb' +AC_SUBST(SRB) SRB=yes +AC_SUBST(TESTSRB) TESTSRB='$(srcdir)/testsrb' AC_ARG_WITH(srb,[ --with-srb=INC,LIB Use the SRB Library [default=no]], ,withval=no) -case $withval in - yes) - AC_CHECK_HEADERS(srbClient.h,,unset SRB TESTSRB) - AC_CHECK_LIB(elf,main,,unset SRB TESTSRB) - AC_CHECK_LIB(socket,main,,unset SRB TESTSRB) - AC_CHECK_LIB(SrbClient,clConnect,,unset SRB TESTSRB) - ;; - no) - AC_MSG_CHECKING(for SRB) - AC_MSG_RESULT(suppressed) - unset SRB TESTSRB - ;; - *) - srb_inc="`echo $withval |cut -f1 -d,`" - if test "X" != "$srb_inc"; then - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$srb_inc" - AC_CHECK_HEADERS(srbClient.h,, - CPPFLAGS="$saved_CPPFLAGS" - unset SRB TESTSRB) - else - AC_CHECK_HEADERS(srbClient.h) - fi - - srb_lib="`echo $withval |cut -f2 -d, -s`" - if test "X" != "$srb_lib"; then - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$srb_lib" - AC_CHECK_LIB(elf,main,,unset SRB TESTSRB) - AC_CHECK_LIB(socket,main,,unset SRB TESTSRB) - AC_CHECK_LIB(SrbClient,clConnect,,unset SRB TESTSRB) - else - AC_CHECK_LIB(elf,main,,unset SRB TESTSRB) - AC_CHECK_LIB(socket,main,,unset SRB TESTSRB) - AC_CHECK_LIB(SrbClient,clConnect,,unset SRB TESTSRB) - fi - ;; + +case "$withval" in + yes) + AC_CHECK_HEADERS(srbClient.h,,unset SRB TESTSRB) + AC_CHECK_LIB(elf,main,,unset SRB TESTSRB) + AC_CHECK_LIB(socket,main,,unset SRB TESTSRB) + AC_CHECK_LIB(SrbClient,clConnect,,unset SRB TESTSRB) + ;; + no) + AC_MSG_CHECKING(for SRB) + AC_MSG_RESULT(suppressed) + unset SRB TESTSRB + ;; + *) + srb_inc="`echo $withval |cut -f1 -d,`" + if test -n "$srb_inc"; then + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I$srb_inc" + AC_CHECK_HEADERS(srbClient.h,, + CPPFLAGS="$saved_CPPFLAGS" + unset SRB TESTSRB) + else + AC_CHECK_HEADERS(srbClient.h) + fi + + srb_lib="`echo $withval |cut -f2 -d, -s`" + if test -n "$srb_lib"; then + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$srb_lib" + AC_CHECK_LIB(elf,main,,unset SRB TESTSRB) + AC_CHECK_LIB(socket,main,,unset SRB TESTSRB) + AC_CHECK_LIB(SrbClient,clConnect,,unset SRB TESTSRB) + else + AC_CHECK_LIB(elf,main,,unset SRB TESTSRB) + AC_CHECK_LIB(socket,main,,unset SRB TESTSRB) + AC_CHECK_LIB(SrbClient,clConnect,,unset SRB TESTSRB) + fi + ;; esac -if test "X-" != "X-$SRB"; then +if test -n "$SRB"; then AC_DEFINE(HAVE_SRB) fi dnl ---------------------------------------------------------------------- -dnl Is Grid Storage present? If so then we can compile in the Grid Storage driver. +dnl Is Grid Storage present? If so then we can compile in the Grid +dnl Storage driver. dnl -AC_SUBST(GRIDSTORAGE) -GRIDSTORAGE=yes -AC_SUBST(TESTGRIDSTORAGE) -TESTGRIDSTORAGE='$(srcdir)/testgridstorage' - +AC_SUBST(GRIDSTORAGE) GRIDSTORAGE=yes +AC_SUBST(TESTGRIDSTORAGE) TESTGRIDSTORAGE='$(srcdir)/testgridstorage' AC_ARG_WITH(gridstorage, - [ --with-gridstorage=INC,LIB Use the Globus Grid Storage driver [default=no]], - ,withval=no) -case $withval in - yes) - AC_CHECK_HEADERS(grid_storage_file.h,,unset GRIDSTORAGE TESTGRIDSTORAGE) - AC_CHECK_LIB(grid_storage_client,main,,unset GRIDSTORAGE TESTGRIDSTORAGE) - AC_CHECK_LIB(grid_storage_file,grid_storage_open,,unset GRIDSTORAGE TESTGRIDSTORAGE) - ;; - no) - AC_MSG_CHECKING(for GRIDSTORAGE) - AC_MSG_RESULT(suppressed) - unset GRIDSTORAGE TESTGRIDSTORAGE - ;; - *) - gridstorage_inc="`echo $withval |cut -f1 -d,`" - if test "X" != "$gridstorage_inc"; then - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$gridstorage_inc" - AC_CHECK_HEADERS(grid_storage_file.h,, - CPPFLAGS="$saved_CPPFLAGS" - unset GRIDSTORAGE TESTGRIDSTORAGE - ) - else - AC_CHECK_HEADERS(grid_storage_file.h) - fi + [ --with-gridstorage=INC,LIB Use the Globus Grid Storage driver [default=no]], + ,withval=no) + +case "$withval" in + yes) + AC_CHECK_HEADERS(grid_storage_file.h,,unset GRIDSTORAGE TESTGRIDSTORAGE) + AC_CHECK_LIB(grid_storage_client,main,,unset GRIDSTORAGE TESTGRIDSTORAGE) + AC_CHECK_LIB(grid_storage_file,grid_storage_open,, + unset GRIDSTORAGE TESTGRIDSTORAGE) + ;; + no) + AC_MSG_CHECKING(for GRIDSTORAGE) + AC_MSG_RESULT(suppressed) + unset GRIDSTORAGE TESTGRIDSTORAGE + ;; + *) + gridstorage_inc="`echo $withval |cut -f1 -d,`" + if test -n "$gridstorage_inc"; then + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I$gridstorage_inc" + AC_CHECK_HEADERS(grid_storage_file.h,, + CPPFLAGS="$saved_CPPFLAGS" + unset GRIDSTORAGE TESTGRIDSTORAGE) + else + AC_CHECK_HEADERS(grid_storage_file.h) + fi - gridstorage_lib="`echo $withval |cut -f2 -d, -s`" - if test "X" != "$gridstorage_lib"; then - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$gridstorage_lib" - AC_CHECK_LIB(grid_storage_client,main,,unset GRIDSTORAGE TESTGRIDSTORAGE) - AC_CHECK_LIB(grid_storage_file,grid_storage_open,,unset GRIDSTORAGE TESTGRIDSTORAGE) - else - AC_CHECK_LIB(grid_storage_client,main,,unset GRIDSTORAGE TESTGRIDSTORAGE) - AC_CHECK_LIB(grid_storage_file,grid_storage_open,,unset GRIDSTORAGE TESTGRIDSTORAGE) - fi - ;; + gridstorage_lib="`echo $withval |cut -f2 -d, -s`" + if test -n "$gridstorage_lib"; then + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$gridstorage_lib" + AC_CHECK_LIB(grid_storage_client,main,, + unset GRIDSTORAGE TESTGRIDSTORAGE) + AC_CHECK_LIB(grid_storage_file,grid_storage_open,, + unset GRIDSTORAGE TESTGRIDSTORAGE) + else + AC_CHECK_LIB(grid_storage_client,main,, + unset GRIDSTORAGE TESTGRIDSTORAGE) + AC_CHECK_LIB(grid_storage_file,grid_storage_open,, + unset GRIDSTORAGE TESTGRIDSTORAGE) + fi + ;; esac -if test "X-" != "X-$GRIDSTORAGE"; then - AC_DEFINE(HAVE_GRIDSTORAGE) + +if test -n "$GRIDSTORAGE"; then + AC_DEFINE(HAVE_GRIDSTORAGE) fi dnl ---------------------------------------------------------------------- @@ -772,46 +771,47 @@ dnl `--with-pthread' command-line switch. The value is an include path dnl and/or a library path. If the library path is specified then it must dnl be preceded by a comma. dnl -AC_SUBST(PTHREAD) -PTHREAD=yes +AC_SUBST(PTHREAD) PTHREAD=yes AC_ARG_WITH(pthread, [ --with-pthread=INC,LIB Use the Pthreads library], ,withval=no) -case $withval in - yes) - AC_CHECK_HEADERS(pthread.h) - if test `uname` != "FreeBSD"; then - AC_CHECK_LIB(pthread, pthread_create,,unset PTHREAD) - else - CFLAGS="$CFLAGS -D_THREAD_SAFE" - LDFLAGS="$LDFLAGS -pthread" - fi - ;; - no) - AC_MSG_CHECKING(for pthread) - AC_MSG_RESULT(suppressed) - unset PTHREAD - ;; - *) - pthread_inc="`echo $withval |cut -f1 -d,`" - if test "X-" != "X-$pthread_inc"; then - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$pthread_inc" - AC_CHECK_HEADERS(pthread.h,,CPPFLAGS="$saved_CPPFLAGS"; unset PTHREAD) - else - AC_CHECK_HEADERS(pthread.h,,unset PTHREAD) - fi - - pthread_lib="`echo $withval |cut -f2 -d, -s`" - if test "X-" != "X-$pthread_lib"; then - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$pthread_lib" - AC_CHECK_LIB(pthread, pthread_create,,LDFLAGS="$saved_LDFLAGS"; unset PTHREAD) - else - AC_CHECK_LIB(pthread, pthread_create,,unset PTHREAD) - fi - ;; + +case "$withval" in + yes) + AC_CHECK_HEADERS(pthread.h) + if test `uname` != "FreeBSD"; then + AC_CHECK_LIB(pthread, pthread_create,,unset PTHREAD) + else + CFLAGS="$CFLAGS -D_THREAD_SAFE" + LDFLAGS="$LDFLAGS -pthread" + fi + ;; + no) + AC_MSG_CHECKING(for pthread) + AC_MSG_RESULT(suppressed) + unset PTHREAD + ;; + *) + pthread_inc="`echo $withval |cut -f1 -d,`" + if test -n "$pthread_inc"; then + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I$pthread_inc" + AC_CHECK_HEADERS(pthread.h,,CPPFLAGS="$saved_CPPFLAGS"; unset PTHREAD) + else + AC_CHECK_HEADERS(pthread.h,,unset PTHREAD) + fi + + pthread_lib="`echo $withval |cut -f2 -d, -s`" + if test -n "$pthread_lib"; then + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$pthread_lib" + AC_CHECK_LIB(pthread, pthread_create,, + LDFLAGS="$saved_LDFLAGS"; unset PTHREAD) + else + AC_CHECK_LIB(pthread, pthread_create,,unset PTHREAD) + fi + ;; esac dnl ---------------------------------------------------------------------- @@ -819,29 +819,29 @@ dnl Enable thread-safe version of library. It requires pthread on. dnl AC_MSG_CHECKING(for thread safe support) AC_ARG_ENABLE(threadsafe, - [ --enable-threadsafe Enable thread safe capability], - THREADSAFE=$enableval) - -case X-$THREADSAFE in - X-|X-no) - AC_MSG_RESULT(no) - ;; - X-yes) - if test X- = X-$PTHREAD; then - AC_MSG_RESULT(error) - AC_MSG_ERROR(needed pthread library not available) - else - AC_MSG_RESULT(yes) - THREADSAFE=yes - fi - ;; - *) - AC_MSG_RESULT(error) - AC_MSG_ERROR(\"$enableval\" is not a valid threadsafe type) - ;; + [ --enable-threadsafe Enable thread safe capability], + THREADSAFE=$enableval) + +case "X-$THREADSAFE" in + X-|X-no) + AC_MSG_RESULT(no) + ;; + X-yes) + if test -n "$PTHREAD"; then + AC_MSG_RESULT(yes) + THREADSAFE=yes + else + AC_MSG_RESULT(error) + AC_MSG_ERROR(needed pthread library not available) + fi + ;; + *) + AC_MSG_RESULT(error) + AC_MSG_ERROR(\'$enableval\' is not a valid threadsafe type) + ;; esac -if test X-yes = X-$THREADSAFE; then +if test "X$THREADSAFE" = "Xyes"; then AC_DEFINE(HAVE_THREADSAFE) fi @@ -944,21 +944,20 @@ AC_TRY_COMPILE([#include<sys/types.h>], dnl ---------------------------------------------------------------------- dnl Check compiler characteristics dnl - AC_C_CONST AC_C_INLINE AC_MSG_CHECKING(for __attribute__ extension) AC_TRY_COMPILE(,[int __attribute__((unused)) x], - AC_DEFINE(HAVE_ATTRIBUTE) - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no)) + AC_DEFINE(HAVE_ATTRIBUTE) + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no)) AC_MSG_CHECKING(for __FUNCTION__ extension) AC_TRY_COMPILE(,[(void)__FUNCTION__], - AC_DEFINE(HAVE_FUNCTION) - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no)) + AC_DEFINE(HAVE_FUNCTION) + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no)) dnl ---------------------------------------------------------------------- dnl Try to figure out how to print `long long'. Some machines use `%lld' @@ -972,17 +971,23 @@ AC_MSG_CHECKING(how to print long long) AC_CACHE_VAL(hdf5_cv_printf_ll, LD_LIBRARY_PATH="$LD_LIBRARY_PATH`echo $LDFLAGS | sed -e 's/-L/:/g' -e 's/ //g'`" export LD_LIBRARY_PATH - for hdf5_cv_printf_ll in l L q ll unknown; do - AC_TRY_RUN([ + +for hdf5_cv_printf_ll in l L q ll unknown; do + AC_TRY_RUN([ #include <stdio.h> #include <stdlib.h> #include <string.h> - main() {char *s=malloc(128); - long long x = (long long)1048576 * (long long)1048576; - sprintf(s,"%${hdf5_cv_printf_ll}d",x); - exit (strcmp(s,"1099511627776"));}], - break) - done) + +int main(void) +{ + char *s=malloc(128); + long long x = (long long)1048576 * (long long)1048576; + sprintf(s,"%${hdf5_cv_printf_ll}d",x); + exit(strcmp(s,"1099511627776")); +} + ], break) +done) + AC_MSG_RESULT(%${hdf5_cv_printf_ll}d and %${hdf5_cv_printf_ll}u) AC_DEFINE_UNQUOTED(PRINTF_LL_WIDTH,"$hdf5_cv_printf_ll") @@ -991,36 +996,36 @@ dnl Turn on debugging by setting compiler flags dnl AC_MSG_CHECKING(for debug flags) AC_ARG_ENABLE(debug, - [ --enable-debug[=all] Turn on debugging in all packages. One may also + [ --enable-debug[=all] Turn on debugging in all packages. One may also specify a comma-separated list of package names without the leading H5 or the word no. The default is most packages.], - DEBUG_PKG=$enableval) + DEBUG_PKG=$enableval) AC_SUBST(DEBUG_PKG) all_packages="ac,b,d,e,f,g,hg,hl,i,mf,mm,o,p,s,t,v,z" -case X-$DEBUG_PKG in - X-|X-yes) - DEBUG_PKG="d,e,f,g,hg,i,mm,o,p,s,t,v,z" - CPPFLAGS="$CPPFLAGS -UNDEBUG" - AC_MSG_RESULT(default ($DEBUG_PKG)) - ;; - X-all) - DEBUG_PKG=$all_packages - CPPFLAGS="$CPPFLAGS -UNDEBUG" - AC_MSG_RESULT(all ($DEBUG_PKG)) - ;; - X-no|X-none) - AC_MSG_RESULT(none) - DEBUG_PKG= - CPPFLAGS="$CPPFLAGS -DNDEBUG" - ;; - *) - AC_MSG_RESULT($DEBUG_PKG) - ;; +case "X-$DEBUG_PKG" in + X-|X-yes) + DEBUG_PKG="d,e,f,g,hg,i,mm,o,p,s,t,v,z" + CPPFLAGS="$CPPFLAGS -UNDEBUG" + AC_MSG_RESULT(default ($DEBUG_PKG)) + ;; + X-all) + DEBUG_PKG=$all_packages + CPPFLAGS="$CPPFLAGS -UNDEBUG" + AC_MSG_RESULT(all ($DEBUG_PKG)) + ;; + X-no|X-none) + AC_MSG_RESULT(none) + DEBUG_PKG= + CPPFLAGS="$CPPFLAGS -DNDEBUG" + ;; + *) + AC_MSG_RESULT($DEBUG_PKG) + ;; esac -if test "X" != "X$DEBUG_PKG"; then +if test -n "$DEBUG_PKG"; then for pkg in `echo $DEBUG_PKG | tr 'a-z,' 'A-Z '`; do CPPFLAGS="$CPPFLAGS -DH5${pkg}_DEBUG" done @@ -1035,7 +1040,7 @@ AC_ARG_ENABLE(trace, TRACE=$enableval) AC_SUBST(TRACE_API) -if test X = "X$TRACE" -o Xyes = "X$TRACE"; then +if test -z "$TRACE" -o "X$TRACE" = "Xyes"; then AC_MSG_RESULT(yes) TRACE_API=yes CPPFLAGS="$CPPFLAGS -DH5_DEBUG_API" @@ -1098,45 +1103,45 @@ dnl executable. For `mpicc' the executable should be run with `mpirun' from dnl the same directory as mpicc if it exists. dnl case "$CC_BASENAME" in - mpicc) - # The mpich compiler. Use mpirun from the same directory if it - # exists. - PARALLEL=mpicc - AC_MSG_CHECKING(for mpirun) - - # Find the path where mpicc is located. - cmd=`echo $CC |cut -f1 -d' '` - if (echo $cmd |grep / >/dev/null); then - path="`echo $cmd |sed 's/\(.*\)\/.*$/\1/'`" - else - for path in `echo $PATH |tr : ' '`; do - if test -x $path/$cmd; then - break; - fi - done - fi - - # Is there an mpirun at that path? - if test -x $path/mpirun; then - AC_MSG_RESULT($path/mpirun) - RUNSERIAL="${RUNSERIAL:-none}" - if test "X-" = "X-$RUNPARALLEL"; then - RUNPARALLEL="$path/mpirun -np \$\${NPROCS:=2}" - fi - else - AC_MSG_RESULT(none) - fi - ;; - - mpcc|mpcc_r) - # The IBM compiler - PARALLEL="$CC_BASENAME" - ;; + mpicc) + dnl The mpich compiler. Use mpirun from the same directory if it + dnl exists. + PARALLEL=mpicc + AC_MSG_CHECKING(for mpirun) + + dnl Find the path where mpicc is located. + cmd=`echo $CC |cut -f1 -d' '` + if (echo $cmd |grep / >/dev/null); then + path="`echo $cmd |sed 's/\(.*\)\/.*$/\1/'`" + else + for path in `echo $PATH |tr : ' '`; do + if test -x $path/$cmd; then + break; + fi + done + fi + + dnl Is there an mpirun at that path? + if test -x $path/mpirun; then + AC_MSG_RESULT($path/mpirun) + RUNSERIAL="${RUNSERIAL:-none}" + if test -z "$RUNPARALLEL"; then + RUNPARALLEL="$path/mpirun -np \$\${NPROCS:=2}" + fi + else + AC_MSG_RESULT(none) + fi + ;; - *) - # Probably not a parallel compiler, but if `--enable-parallel' - # is defined below then we're still building a parallel hdf5. - ;; + mpcc|mpcc_r) + dnl The IBM compiler + PARALLEL="$CC_BASENAME" + ;; + + *) + dnl Probably not a parallel compiler, but if `--enable-parallel' + dnl is defined below then we're still building a parallel hdf5. + ;; esac dnl ---------------------------------------------------------------------- @@ -1148,104 +1153,103 @@ dnl or mpcc) then parallel support is enabled but configure doesn't search dnl for any parallel header files or libraries. dnl AC_ARG_ENABLE(parallel, - [ --enable-parallel=TYPE Search for MPI-IO and MPI support files]) + [ --enable-parallel=TYPE Search for MPI-IO and MPI support files]) AC_MSG_CHECKING(for parallel support files) case "X-$enable_parallel" in - X-|X-no|X-none) - # Either we are not compiling for parallel or the header and library - # files and locations are known to the compiler (this is the case - # for a correct installation of mpicc for instance). - AC_MSG_RESULT(skipped) - ;; - - X-yes) - # We want to compile a parallel library with a compiler that - # may already know how to link with MPI and MPI-IO. - AC_MSG_RESULT(provided by compiler) - PARALLEL=yes - - # Try link a simple MPI program. If fail, try again with -lmpi. - AC_TRY_LINK(,MPI_Init(),,AC_CHECK_LIB(mpi,MPI_Init,,PARALLEL=no)) - - # Then try link a simple MPI-IO program. If fail, try again with - # -lmpio. - if test "yes" = "$PARALLEL"; then - AC_TRY_LINK(,MPI_File_open(),, - AC_CHECK_LIB(mpio,MPI_File_open,,PARALLEL=no)) - fi - - # Set RUNPARALLEL to mpirun if not set yet. - if test "yes" = "$PARALLEL" -a "X-" = "X-$RUNPARALLEL"; then - RUNPARALLEL="mpirun -np \$\${NPROCS:=2}" - fi - ;; - - X-mpich) - # For normal mpich installation the compiler, mpicc, should know - # where the MPI and MPI-IO header files are located and know which - # extra libraries need to be linked and will supply appropriate - # flags to the underlying compiler. - AC_MSG_RESULT(mpich) - AC_MSG_WARN(*** Why aren't you using an mpicc compiler? ***) - - # Apparently mpicc isn't installed correctly so configure must search - # for the header files and libraries. Actually we only have to search - # for the libraries in order to get the onto the link line, the user - # will have already told us about the locations. Fail if something - # is missing. - PARALLEL=mpich - AC_CHECK_LIB(mpich,MPI_Init,,AC_MSG_ERROR(no mpich library)) - ;; + X-|X-no|X-none) + dnl Either we are not compiling for parallel or the header and + dnl library files and locations are known to the compiler (this is + dnl the case for a correct installation of mpicc for instance). + AC_MSG_RESULT(skipped) + ;; + + X-yes) + dnl We want to compile a parallel library with a compiler that + dnl may already know how to link with MPI and MPI-IO. + AC_MSG_RESULT(provided by compiler) + PARALLEL=yes + + dnl Try link a simple MPI program. If fail, try again with -lmpi. + AC_TRY_LINK(,MPI_Init(),,AC_CHECK_LIB(mpi,MPI_Init,,PARALLEL=no)) + + dnl Then try link a simple MPI-IO program. If fail, try again with + dnl -lmpio. + if test "X$PARALLEL" = "Xyes"; then + AC_TRY_LINK(,MPI_File_open(),, + AC_CHECK_LIB(mpio,MPI_File_open,,PARALLEL=no)) + fi + + dnl Set RUNPARALLEL to mpirun if not set yet. + if test "X$PARALLEL" = "Xyes" -a -z "$RUNPARALLEL"; then + RUNPARALLEL="mpirun -np \$\${NPROCS:=2}" + fi + ;; + + X-mpich) + dnl For normal mpich installation the compiler, mpicc, should know + dnl where the MPI and MPI-IO header files are located and know which + dnl extra libraries need to be linked and will supply appropriate + dnl flags to the underlying compiler. + AC_MSG_RESULT(mpich) + AC_MSG_WARN(*** Why aren't you using an mpicc compiler? ***) + + dnl Apparently mpicc isn't installed correctly so configure must search + dnl for the header files and libraries. Actually we only have to search + dnl for the libraries in order to get the onto the link line, the user + dnl will have already told us about the locations. Fail if something + dnl is missing. + PARALLEL=mpich + AC_CHECK_LIB(mpich,MPI_Init,,AC_MSG_ERROR(no mpich library)) + ;; *) - AC_MSG_RESULT(error) - AC_MSG_ERROR(\"$enable_parallel\" is not a valid parallel search type) - ;; + AC_MSG_RESULT(error) + AC_MSG_ERROR(\'$enable_parallel\' is not a valid parallel search type) + ;; esac dnl ---------------------------------------------------------------------- dnl Should the `testpar' directory participate in the build? dnl -if test "X-" != "X-$PARALLEL"; then - TESTPARALLEL=testpar +if test -n "$PARALLEL"; then + TESTPARALLEL=testpar fi dnl ---------------------------------------------------------------------- dnl Print some other parallel information and do some sanity checks. dnl -if test "X-" != "X-$PARALLEL"; then - # We are building a parallel library - AC_DEFINE(HAVE_PARALLEL) - - # Display what we found about running programs - AC_MSG_CHECKING(prefix for running on one processor) - AC_MSG_RESULT($RUNSERIAL) - AC_MSG_CHECKING(prefix for running in parallel) - AC_MSG_RESULT($RUNPARALLEL) - - # Check that we can link a simple MPI and MPI-IO application - AC_MSG_CHECKING(whether a simple MPI-IO program can be linked) - AC_TRY_LINK(,[MPI_Init();MPI_File_open();], - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no) - AC_MSG_ERROR('unable to link a simple MPI-IO application')) - - - # There *must* be some way to run in parallel even if it's just the - # word `none'. - if test "X-" = "X-$RUNPARALLEL"; then - AC_MSG_ERROR(no way to run a parallel program) - fi - - # If RUNSERIAL or RUNPARALLEL is the word `none' then replace it with - # the empty string. - if test "X-none" = "X-$RUNSERIAL"; then - RUNSERIAL= - fi - if test "X-none" = "X-$RUNPARALLEL"; then - RUNPARALLEL= - fi +if test -n "$PARALLEL"; then + dnl We are building a parallel library + AC_DEFINE(HAVE_PARALLEL) + + dnl Display what we found about running programs + AC_MSG_CHECKING(prefix for running on one processor) + AC_MSG_RESULT($RUNSERIAL) + AC_MSG_CHECKING(prefix for running in parallel) + AC_MSG_RESULT($RUNPARALLEL) + + dnl Check that we can link a simple MPI and MPI-IO application + AC_MSG_CHECKING(whether a simple MPI-IO program can be linked) + AC_TRY_LINK(,[MPI_Init();MPI_File_open();], + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no) + AC_MSG_ERROR('unable to link a simple MPI-IO application')) + + dnl There *must* be some way to run in parallel even if it's just the + dnl word `none'. + if test -z "$RUNPARALLEL"; then + AC_MSG_ERROR(no way to run a parallel program) + fi + + dnl If RUNSERIAL or RUNPARALLEL is the word `none' then replace it with + dnl the empty string. + if test "X$RUNSERIAL" = "Xnone"; then + RUNSERIAL= + fi + if test "X$RUNPARALLEL" = "Xnone"; then + RUNPARALLEL= + fi fi dnl ---------------------------------------------------------------------- @@ -1253,36 +1257,37 @@ dnl Set some variables for general configuration information to be saved dnl and installed with the libraries. dnl -# HDF5 version from the first line of the README file. +dnl HDF5 version from the first line of the README file. H5_VERSION=`cut -d' ' -f3 $srcdir/README |head -1` AC_SUBST(H5_VERSION) -# Configuration date +dnl Configuration date AC_SUBST(CONFIG_DATE) CONFIG_DATE=`date` -# User doing the configuration +dnl User doing the configuration AC_SUBST(CONFIG_USER) CONFIG_USER="`whoami`@`hostname`" -if test "X-$ORGANIZATION" != "X-"; then - CONFIG_USER="$CONFIG_USER at $ORGANIZATION" +if test -n "$ORGANIZATION"; then + CONFIG_USER="$CONFIG_USER at $ORGANIZATION" fi -# Configuration mode (production, development, profile, etc) saved above. +dnl Configuration mode (production, development, profile, etc) saved above. AC_SUBST(CONFIG_MODE) -# Byte sex from the AC_C_BIGENDIAN macro. +dnl Byte sex from the AC_C_BIGENDIAN macro. AC_SUBST(BYTESEX) -if test $ac_cv_c_bigendian = yes; then - BYTESEX="big-endian" +if test "X$ac_cv_c_bigendian" = "Xyes"; then + BYTESEX="big-endian" else - BYTESEX="little-endian" + BYTESEX="little-endian" fi -# Are we compiling static libraries, shared libraries, or both? This is only -# used for the libhdf5.settings file. We can't just look at $enable_static and -# $enable_shared because if they're yes the ltconfig might have decided that -# one or the other is simply not possible. Therefore we have to look in the -# generated `libtool' shell script for lines that set the value of -# `build_libtool_libs' (shared) and `build_old_libs' (static). +dnl Are we compiling static libraries, shared libraries, or both? This +dnl is only used for the libhdf5.settings file. We can't just look at +dnl $enable_static and $enable_shared because if they're yes the ltconfig +dnl might have decided that one or the other is simply not possible. +dnl Therefore we have to look in the generated `libtool' shell script for +dnl lines that set the value of `build_libtool_libs' (shared) and +dnl `build_old_libs' (static). AC_SUBST(STATIC_SHARED) if (grep '^build_libtool_libs=yes' libtool >/dev/null); then enable_shared=yes @@ -1294,37 +1299,50 @@ if (grep '^build_old_libs=yes' libtool >/dev/null); then else enable_static=no fi -if test $enable_static = yes && test $enable_shared = yes; then +if test "X$enable_static" = "Xyes" && test "X$enable_shared" = "Xyes"; then STATIC_SHARED="static, shared" -elif test $enable_static = yes; then +elif test "X$enable_static" = "Xyes"; then STATIC_SHARED="static" -elif test $enable_shared = yes; then +elif test "X$enable_shared" = "Xyes"; then STATIC_SHARED="shared" else STATIC_SHARED="none" fi -# Parallel support? (set above except empty if none) +dnl Parallel support? (set above except empty if none) PARALLEL=${PARALLEL:-no} -# Compiler with version information +dnl Compiler with version information AC_SUBST(CC_VERSION) -if test "X-$cc_vendor" != "X-" && test "X-$cc_version" != "X-"; then - CC_VERSION="$CC ($cc_vendor-$cc_version)" +if test -n "$cc_vendor" && test -n "$cc_version"; then + CC_VERSION="$CC ($cc_vendor-$cc_version)" +else + dnl If $CC contains directory component, take it as is; + dnl else search it among PATH components. + if `echo $CC | grep / 2>&1 /dev/null`; then + CC_VERSION="$CC" + else + for x in `echo $PATH | sed -e 's/:/ /g'`; do + if test -x $x/$CC; then + CC_VERSION="$x/$CC" + break + fi + done + fi +fi + +dnl ---------------------------------------------------------------------- +dnl Where is the root of the source tree. Give an absolute address so +dnl we can find it no matter which directory of the distribution is our +dnl current directory. The built-in pwd fails on some systems, but the +dnl /bin/pwd version works OK. +dnl +if test -x /bin/pwd; then + pwd=/bin/pwd else - # If $CC contains directory component, take it as is; - # else search it among PATH components. - if `echo $CC | grep / 2>&1 /dev/null`; then - CC_VERSION="$CC" - else - for x in `echo $PATH | sed -e 's/:/ /g'`; do - if test -x $x/$CC; then - CC_VERSION="$x/$CC" - break - fi - done - fi + pwd=pwd fi +AC_SUBST(ROOT) ROOT=`$pwd` dnl ---------------------------------------------------------------------- dnl Determine the runtime libraries we may need to include in the @@ -1332,23 +1350,37 @@ dnl libtools command so that executables will find the correct dynamic dnl libraries. dnl DYNAMIC_DIRS="" -if test -n $LDFLAGS; then +if test -n "$LDFLAGS"; then for d in $LDFLAGS ; do - d=`echo $d | sed -e 's/-L/-R/g'` - - dnl If the path isn't absolute, make it so by prepending the pwd - dnl to it. + d=`echo $d | sed -e 's/-L//g'` case "$d" in .*) - d=`pwd`/$d + dnl If the path isn't absolute, make it so by prepending the + dnl ROOT directory to it. + d=${ROOT}/$d ;; esac - - DYNAMIC_DIRS="$d $DYNAMIC_DIRS" + DYNAMIC_DIRS="-R${d} $DYNAMIC_DIRS" done fi AC_SUBST(DYNAMIC_DIRS) +if test -n "$CPPFLAGS"; then + TEMP_CPPFLAGS="" + for d in $CPPFLAGS ; do + case "$d" in + -I.*) + dnl If the path isn't absolute, make it so by prepending + dnl the ROOT directory to it. + d=`echo $d | sed -e 's/-I//g'` + d=-I${ROOT}/${d} + ;; + esac + TEMP_CPPFLAGS="$d $TEMP_CPPFLAGS" + done + CPPFLAGS=$TEMP_CPPFLAGS +fi + dnl ---------------------------------------------------------------------- dnl Build the Makefiles. Almost every Makefile.in will begin with the line dnl `@COMMENCE@' and end with the line `@CONCLUDE@'. These lines insert @@ -1370,17 +1402,6 @@ else AC_SUBST(SETX) SETX="set -x" fi -dnl Where is the root of the source tree. Give an absolute address so -dnl we can find it no matter which directory of the distribution is our -dnl current directory. The built-in pwd fails on some systems, but the -dnl /bin/pwd version works OK. -if test -x /bin/pwd; then - pwd=/bin/pwd -else - pwd=pwd -fi -AC_SUBST(ROOT) ROOT=`$pwd` - dnl Some cleanup stuff rm -f conftest conftest.o conftest.c dummy.o @@ -1421,9 +1442,9 @@ EOF dnl Put the C++ ifdef wrappers in the H5pubconf file as well, but only dnl if it's not there already. if (grep __cplusplus src H5pubconf.h) >/dev/null 2>&1; then - : + : else - cat >> src/H5pubconf.h <<EOF + cat >> src/H5pubconf.h <<EOF /* inline is a keyword in C++. If this is a C++ compiler, undefine it */ #if defined(__cplusplus) && defined(inline) |