[svn-r2026] Switch from Globus1.0 to Globus1.1.x. Remove Globus configuration, keep GASS configuration.

1 files changed, 32 insertions, 94 deletions

diff --git a/configure.in b/configure.in
index 3e213d1..0e39ed6 100644
--- a/configure.in
+++ b/configure.in
@@ -496,7 +496,8 @@ case $withval in
 esac
 
 dnl ----------------------------------------------------------------------
-dnl Is SSL library present?  It is needed by the Grid Storage driver.
+dnl Is SSL library present?  It is needed by GLOBUS-GASS and Grid Storage 
+dnl driver.
 dnl
 AC_SUBST(SSL)
 SSL=yes
@@ -510,26 +511,28 @@ AC_CHECK_LIB(crypto,main,,unset SSL)
 AC_CHECK_LIB(ssl,SSL_get_version,,unset SSL)
 
 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.
+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_ARG_WITH(gass,[  --with-gass=INC,LIB     Use the GASS driver [default=no]],
+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_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)
+        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)
@@ -553,19 +556,25 @@ case $withval in
 	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)
+            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_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)
+            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
@@ -574,77 +583,6 @@ if test "X-" != "X-$GASS"; then
 fi
 
 dnl ----------------------------------------------------------------------
-dnl Is GLOBUS Library present?  It is needed by the Grid Storage 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 Grid Storage present?  If so then we can compile in the Grid Storage driver.
 dnl
 AC_SUBST(GRIDSTORAGE)