[Gfarm-commits] SF.net SVN: gfarm:[4006] gfarm_v2/trunk/configure

[<ta...@us...>]

Revision: 4006
          http://gfarm.svn.sourceforge.net/gfarm/?rev=4006&view=rev
Author:   tatebe
Date:     2008-08-09 12:41:15 +0000 (Sat, 09 Aug 2008)

Log Message:
-----------
regen

Modified Paths:
--------------
    gfarm_v2/trunk/configure

Modified: gfarm_v2/trunk/configure
===================================================================
--- gfarm_v2/trunk/configure	2008-08-09 12:41:00 UTC (rev 4005)
+++ gfarm_v2/trunk/configure	2008-08-09 12:41:15 UTC (rev 4006)
@@ -20350,15 +20350,24 @@
  globus_cflags='${GLOBUS_CFLAGS}'
  globus_targets='${GLOBUS_TARGETS}'
 
- openssl_includes="${globus_includes}"
- case ${globus_static} in
- yes)	openssl_libs="${globus_libdir}/libssl_${globus_flavor}.a ${globus_libdir}/libcrypto_${globus_flavor}.a"
+ # replace openssl library with that included in globus
+ if test -x ${globus_location}/bin/globus-version; then
+   globus_version=`env GLOBUS_LOCATION=${globus_location} ${globus_location}/bin/globus-version`
+   case ${globus_version} in
+   4.0*|3*|2*)
+     openssl_includes="${globus_includes}"
+     case ${globus_static} in
+     yes) openssl_libs="${globus_libdir}/libssl_${globus_flavor}.a ${globus_libdir}/libcrypto_${globus_flavor}.a"
 	echo "$as_me:$LINENO: result: using globus static library: yes" >&5
 echo "${ECHO_T}using globus static library: yes" >&6;;
- *)	openssl_libs="-R${globus_libdir} -L${globus_libdir} -lssl_${globus_flavor} -lcrypto_${globus_flavor}"
+     *)	  openssl_libs="-R${globus_libdir} -L${globus_libdir} -lssl_${globus_flavor} -lcrypto_${globus_flavor}"
 	echo "$as_me:$LINENO: result: using globus static library: no" >&5
 echo "${ECHO_T}using globus static library: no" >&6;;
- esac
+     esac;;
+   *) # after 4.2.0, globus does not include openssl libarary.
+     ;;
+   esac
+ fi
 
 
 cat >>confdefs.h <<\_ACEOF


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.