[svn-r1930] Add Globus 1.1; refer Gass to Globus 1.0

1 files changed, 165 insertions, 87 deletions

diff --git a/configure.in b/configure.in
index bd060a0..c28ddc0 100644
--- a/configure.in
+++ b/configure.in
@@ -496,6 +496,18 @@ case $withval in
 esac
 
 dnl ----------------------------------------------------------------------
+dnl Is SSL library present?  It is needed by the DPSS driver.
+dnl
+AC_ARG_WITH(ssl,[  --with-ssl=LIB          Use SSL libs from LIB ],,)
+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 TESTGASS)
+
+dnl ----------------------------------------------------------------------
 dnl Is Globus-GASS present?  If so then we can compile in the GASS driver.
 dnl The reason we need to check for so many libs because globus is not
 dnl quite modular yet.  Globus folks plan to reduce the library dependencies.
@@ -505,112 +517,178 @@ GASS=yes
 AC_SUBST(TESTGASS)
 TESTGASS='$(srcdir)/testgass'
 
-AC_ARG_WITH(gass,[\
-  --with-gass=GLOBUS_DIR  Use the Globus GASS driver [default=no]
-                          Globus is installed in GLOBUS_DIR],
-                        ,withval=no)
+AC_ARG_WITH(gass,[  --with-gass=INC,LIB     Use the GASS driver [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_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="$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
+	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
-        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)
-        ;;
+	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
+	;;
 esac
 if test "X-" != "X-$GASS"; then
     AC_DEFINE(HAVE_GASS)
 fi
 
 dnl ----------------------------------------------------------------------
+dnl Is GLOBUS Library present?  It is needed by the DPSS driver.
+dnl
+AC_SUBST(GLOBUS)
+GLOBUS=yes
+AC_SUBST(TESTGLOBUS)
+TESTGLOBUS='$(srcdir)/testglobus'
+
+AC_ARG_WITH(globus,[  --with-globus=INC,LIB   Use the GLOBUS Library [default=no]],
+	    ,withval=no)
+case $withval in
+    yes)
+	AC_CHECK_HEADERS(globus_common.h,,unset GLOBUS TESTGLOBUS)
+        AC_CHECK_LIB(globus_common,globus_module_activate,,unset GLOBUS TESTGLOBUS)
+        AC_CHECK_LIB(globus_gass_cache,main,,unset GLOBUS TESTGLOBUS)
+        AC_CHECK_LIB(globus_gaa,main,,unset GLOBUS TESTGLOBUS)
+        AC_CHECK_LIB(globus_gss,main,,unset GLOBUS TESTGLOBUS)
+        AC_CHECK_LIB(globus_gss_assist,main,,unset GLOBUS TESTGLOBUS)
+        AC_CHECK_LIB(globus_io,main,,unset GLOBUS TESTGLOBUS)
+        AC_CHECK_LIB(globus_gass_transfer_assist,main,,unset GLOBUS TESTGLOBUS)
+        AC_CHECK_LIB(globus_gass_transfer,main,,unset GLOBUS TESTGLOBUS)
+        AC_CHECK_LIB(globus_gass_file,globus_gass_open,,unset GLOBUS TESTGLOBUS)
+	;;
+    no)
+	AC_MSG_CHECKING(for GLOBUS)
+	AC_MSG_RESULT(suppressed)
+	unset GLOBUS TESTGLOBUS
+	;;
+    *)
+	globus_inc="`echo $withval |cut -f1 -d,`"
+	if test "X" != "$globus_inc"; then
+	    saved_CPPFLAGS="$CPPFLAGS"
+	    CPPFLAGS="$CPPFLAGS -I$globus_inc"
+	    AC_CHECK_HEADERS(globus_common.h,,
+	        CPPFLAGS="$saved_CPPFLAGS"
+	        unset GLOBUS TESTGLOBUS
+            )
+	else
+	    AC_CHECK_HEADERS(globus_common.h)
+	fi
+	
+	globus_lib="`echo $withval |cut -f2 -d, -s`"
+	if test "X" != "$globus_lib"; then
+	    saved_LDFLAGS="$LDFLAGS"
+	    LDFLAGS="$LDFLAGS -L$globus_lib"
+            AC_CHECK_LIB(globus_common,globus_module_activate,,unset GLOBUS TESTGLOBUS)
+            AC_CHECK_LIB(globus_gass_cache,main,,unset GLOBUS TESTGLOBUS)
+            AC_CHECK_LIB(globus_gaa,main,,unset GLOBUS TESTGLOBUS)
+            AC_CHECK_LIB(globus_gss,main,,unset GLOBUS TESTGLOBUS)
+            AC_CHECK_LIB(globus_gss_assist,main,,unset GLOBUS TESTGLOBUS)
+            AC_CHECK_LIB(globus_io,main,,unset GLOBUS TESTGLOBUS)
+            AC_CHECK_LIB(globus_gass_transfer_assist,main,,unset GLOBUS TESTGLOBUS)
+            AC_CHECK_LIB(globus_gass_transfer,main,,unset GLOBUS TESTGLOBUS)
+            AC_CHECK_LIB(globus_gass_file,globus_gass_open,,unset GLOBUS TESTGLOBUS)
+	else
+            AC_CHECK_LIB(globus_common,globus_module_activate,,unset GLOBUS TESTGLOBUS)
+            AC_CHECK_LIB(globus_gass_cache,main,,unset GLOBUS TESTGLOBUS)
+            AC_CHECK_LIB(globus_gaa,main,,unset GLOBUS TESTGLOBUS)
+            AC_CHECK_LIB(globus_gss,main,,unset GLOBUS TESTGLOBUS)
+            AC_CHECK_LIB(globus_gss_assist,main,,unset GLOBUS TESTGLOBUS)
+            AC_CHECK_LIB(globus_io,main,,unset GLOBUS TESTGLOBUS)
+            AC_CHECK_LIB(globus_gass_transfer_assist,main,,unset GLOBUS TESTGLOBUS)
+            AC_CHECK_LIB(globus_gass_transfer,main,,unset GLOBUS TESTGLOBUS)
+            AC_CHECK_LIB(globus_gass_file,globus_gass_open,,unset GLOBUS TESTGLOBUS)
+	fi
+	;;
+esac
+if test "X-" != "X-$GLOBUS"; then
+    AC_DEFINE(HAVE_GLOBUS)
+fi
+
+dnl ----------------------------------------------------------------------
 dnl Is DPSS present?  If so then we can compile in the DPSS driver.
 dnl
 AC_SUBST(DPSS)
 DPSS=yes
+AC_SUBST(TESTDPSS)
+TESTDPSS='$(srcdir)/testdpss'
 
-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
-
+AC_ARG_WITH(dpss,
+	[  --with-dpss=INC,LIB     Use the Globus DPSS driver [default=no]],
+	,withval=no)
+case $withval in
+    yes)
+	AC_CHECK_HEADERS(grid_storage_file.h,,unset DPSS TESTDPSS)
+	AC_CHECK_LIB(grid_storage_client,main,,unset DPSS TESTDPSS)
+	AC_CHECK_LIB(grid_storage_file,grid_storage_open,,unset DPSS TESTDPSS)
+	;;
+    no)
+	AC_MSG_CHECKING(for DPSS)
+	AC_MSG_RESULT(suppressed)
+	unset DPSS TESTDPSS
+	;;
+    *)
+	dpss_inc="`echo $withval |cut -f1 -d,`"
+	if test "X" != "$dpss_inc"; then
+	    saved_CPPFLAGS="$CPPFLAGS"
+	    CPPFLAGS="$CPPFLAGS -I$dpss_inc"
+	    AC_CHECK_HEADERS(grid_storage_file.h,,
+	        CPPFLAGS="$saved_CPPFLAGS"
+	        unset DPSS TESTDPSS
+            )
+	else
+	    AC_CHECK_HEADERS(grid_storage_file.h)
+	fi
+	
+	dpss_lib="`echo $withval |cut -f2 -d, -s`"
+	if test "X" != "$dpss_lib"; then
+	    saved_LDFLAGS="$LDFLAGS"
+	    LDFLAGS="$LDFLAGS -L$dpss_lib"
+            AC_CHECK_LIB(grid_storage_client,main,,unset DPSS TESTDPSS)
+            AC_CHECK_LIB(grid_storage_file,grid_storage_open,,unset DPSS TESTDPSS)
+	else
+            AC_CHECK_LIB(grid_storage_client,main,,unset DPSS TESTDPSS)
+            AC_CHECK_LIB(grid_storage_file,grid_storage_open,,unset DPSS TESTDPSS)
+	fi
+	;;
+esac
 if test "X-" != "X-$DPSS"; then
     AC_DEFINE(HAVE_DPSS)
 fi