mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-30 15:32:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r4550] Purpose:

Browse Source 
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.)
This commit is contained in:
Albert Cheng 2001-10-16 16:08:50 -05:00
parent cdbb523b94
commit 99ae70b921
2 changed files with 519 additions and 410 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

891
configure vendored
View File

File diff suppressed because it is too large Load Diff

38
configure.in
View File

@ -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