[svn-r1924] DPSS is checked in.

1 files changed, 97 insertions, 41 deletions

diff --git a/configure.in b/configure.in
index a11819b..bd060a0 100644
--- a/configure.in
+++ b/configure.in
@@ -505,61 +505,117 @@ GASS=yes
 AC_SUBST(TESTGASS)
 TESTGASS='$(srcdir)/testgass'
 
-AC_ARG_WITH(gass,[  --with-gass=INC,LIB     Use the GASS driver [default=no]],
-	    ,withval=no)
+AC_ARG_WITH(gass,[\
+  --with-gass=GLOBUS_DIR  Use the Globus GASS driver [default=no]
+                          Globus is installed in GLOBUS_DIR],
+                        ,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_dc,main,,unset GASS TESTGASS)
-	AC_CHECK_LIB(globus_nexus,main,,unset GASS TESTGASS)
-	AC_CHECK_LIB(globus_gass_client,main,,unset GASS TESTGASS)
-	AC_CHECK_LIB(globus_gass_cache,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
+        gass_inc="$withval/include"
+        if test "yes/include" != "$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_dc,main,,unset GASS TESTGASS)
-	    AC_CHECK_LIB(globus_nexus,main,,unset GASS TESTGASS)
-	    AC_CHECK_LIB(globus_gass_client,main,,unset GASS TESTGASS)
-	    AC_CHECK_LIB(globus_gass_cache,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_dc,main,,unset GASS TESTGASS)
-	    AC_CHECK_LIB(globus_nexus,main,,unset GASS TESTGASS)
-	    AC_CHECK_LIB(globus_gass_client,main,,unset GASS TESTGASS)
-	    AC_CHECK_LIB(globus_gass_cache,main,,unset GASS TESTGASS)
-	    AC_CHECK_LIB(globus_gass_file,globus_gass_open,,unset GASS TESTGASS)
-	fi
-	;;
+        else
+            AC_CHECK_HEADERS(globus_common.h)
+        fi
+        gass_lib="$withval/lib"
+        if test "yes/lib" != "$gass_lib"; then
+            LDFLAGS="$LDFLAGS -L$gass_lib"
+        fi
+
+        AC_ARG_WITH(ssl-libpath,[  --with-ssl-libpath=DIR  Use SSL libs from DIR
+],,)
+        if test "X-" != "X-$with_ssl_libpath"; then
+            LDFLAGS="$LDFLAGS -L$with_ssl_libpath"
+        fi
+
+        AC_CHECK_LIB(crypto,main,,unset GASS TESTGASS)
+        AC_CHECK_LIB(ssl,SSL_get_version,,AC_MSG_WARN([SSL libraries not found (
+required for GASS). Please use option --with-ssl-libpath !]); unset GASS TESTGAS
+S)
+
+        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)
+        ;;
 esac
 if test "X-" != "X-$GASS"; then
     AC_DEFINE(HAVE_GASS)
 fi
 
 dnl ----------------------------------------------------------------------
+dnl Is DPSS present?  If so then we can compile in the DPSS driver.
+dnl
+AC_SUBST(DPSS)
+DPSS=yes
+
+AC_ARG_WITH(dpss,[\
+  --with-dpss=DPSS_DIR    Use the Globus DPSS driver [default=no]
+                          DPSS Storage Client is installed in DPSS_DIR],
+                       ,withval=no)
+dnl ----------------------------------------------------------------------
+if test "X-" != "X-$GASS"; then
+    case $withval in
+        no)
+            AC_MSG_CHECKING(for DPSS)
+            AC_MSG_RESULT(skipped)
+            unset DPSS
+            ;;
+        *)
+            dpss_inc="$with_dpss/include"
+            if test "/include" != "$dpss_inc"; then
+                saved_CPPFLAGS="$CPPFLAGS"
+                CPPFLAGS="$CPPFLAGS -I$dpss_inc"
+                AC_CHECK_HEADERS(grid_storage_file.h,,
+                    CPPFLAGS="$saved_CPPFLAGS"
+                    unset DPSS
+                )
+            else
+                AC_CHECK_HEADERS(grid_storage_file.h)
+            fi
+
+            dpss_lib="$with_dpss/lib"
+            if test "/lib" != "$dpss_lib"; then
+                LDFLAGS="$LDFLAGS -L$dpss_lib"
+            fi
+            AC_CHECK_LIB(grid_storage_client,main,,unset DPSS)
+            AC_CHECK_LIB(grid_storage_file,grid_storage_open,,unset DPSS)
+            ;;
+    esac
+    if test "X-" = "X-$DPSS"; then
+        AC_MSG_WARN(DPSS was not configured: no valid Storage Client installatio
+n found !)
+    fi
+else
+    if test "no" != "$withval"; then
+        AC_MSG_WARN(DPSS was not configured - it requires option --with-gass)
+    else
+        AC_MSG_CHECKING(for DPSS)
+        AC_MSG_RESULT(skipped)
+    fi
+    unset DPSS
+fi
+
+if test "X-" != "X-$DPSS"; then
+    AC_DEFINE(HAVE_DPSS)
+fi
+
+dnl ----------------------------------------------------------------------
 dnl Is LLNL's PDB present? If so then we'll compile the PDB-to-HDF5
 dnl translator.
 AC_SUBST(PDB2HDF)