diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2001-10-16 21:08:50 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2001-10-16 21:08:50 (GMT) |
| commit | 99ae70b9210dc6ac8e6a6e7c7510e58e87734d31 (patch) | |
| tree | 327cd3ae08c19e4cdd2c95f635a14b4321e2fe7f /configure.in | |
| parent | cdbb523b940f70c160402a32f236f7e8121aabf9 (diff) | |
| download | hdf5-99ae70b9210dc6ac8e6a6e7c7510e58e87734d31.zip hdf5-99ae70b9210dc6ac8e6a6e7c7510e58e87734d31.tar.gz hdf5-99ae70b9210dc6ac8e6a6e7c7510e58e87734d31.tar.bz2 | |
[svn-r4550] Purpose:
Bug fix
Description:
GASS nor gridstorage worked any more because SSL library testing
was moved after them.
Solution:
Moved SSL library to be tested before GASS or Gridstorage options
are tested. Also make the testing of SSL libraries default to
no testing, so that it won't get activated unnecessarily.
Platforms tested:
IRIX64 -64, serial and parallel. (GASS driver needs globus
software which is available in modi4 only.)
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/configure.in b/configure.in index a962393..7c92063 100644 --- a/configure.in +++ b/configure.in @@ -760,6 +760,29 @@ case $withval in ;; esac +dnl Is SSL library present? It is needed by GLOBUS-GASS and Grid Storage +dnl driver. SSL must be tested before them. +AC_SUBST(SSL) SSL=yes +AC_ARG_WITH(ssl,[ --with-ssl=LIB Use SSL libs from LIB [default=no]], + ,withval=no) +case "$withval" in + yes) + AC_CHECK_LIB(crypto,main,,unset SSL) + AC_CHECK_LIB(ssl,SSL_get_version,,unset SSL) + ;; + no) + AC_MSG_CHECKING(for SSL) + AC_MSG_RESULT(suppressed) + unset SSL + ;; + *) + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$with_ssl" + AC_CHECK_LIB(crypto,main,, LDFLAGS="$saved_LDFLAGS"; unset SSL) + AC_CHECK_LIB(ssl,SSL_get_version,, LDFLAGS="$saved_LDFLAGS"; unset SSL) + ;; +esac + dnl ---------------------------------------------------------------------- dnl Is GLOBUS-GASS(1.1.0 or 1.1.1) Library present? It is also needed by dnl the Grid Storage driver. @@ -892,21 +915,6 @@ if test -n "$GRIDSTORAGE"; then AC_DEFINE(HAVE_GRIDSTORAGE) fi -if test -n "$GRIDSTORAGE" -o -n "$GASS"; then - dnl Is SSL library present? It is needed by GLOBUS-GASS and Grid - dnl Storage driver. - dnl - AC_SUBST(SSL) SSL=yes - AC_ARG_WITH(ssl, [ --with-ssl=LIB Use SSL libs from LIB ],,) - - if test -n "$with_ssl"; then - LDFLAGS="$LDFLAGS -L$with_ssl" - fi - - AC_CHECK_LIB(crypto,main,,unset SSL) - AC_CHECK_LIB(ssl,SSL_get_version,,unset SSL) -fi - dnl ---------------------------------------------------------------------- dnl Are SRB Client and other system libraries(socket, elf) present? dnl |