From 827b4d2c0936a41ba63e92b614b20b9004566d5d Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Mon, 30 Jul 2001 17:48:40 -0500 Subject: [svn-r4283] Purpose: Cleanup Description: The SSL library was being tested for even if we didn't need it. This was causing some libraries to be included in our library which weren't needed (i.e., libcrypto). Solution: Only check for the SSL library if either GASS or Grid Storage is specified. Platforms tested: Linux --- configure | 1434 +++++++++++++++++++++++++++++----------------------------- configure.in | 375 +++++++-------- 2 files changed, 915 insertions(+), 894 deletions(-) diff --git a/configure b/configure index 7283844..68edf0a 100755 --- a/configure +++ b/configure @@ -143,14 +143,14 @@ ac_help="$ac_help ac_help="$ac_help --with-zlib=INC,LIB Use the GNU zlib compression" ac_help="$ac_help - --with-ssl=LIB Use SSL libs from LIB " -ac_help="$ac_help --with-gass=INC,LIB Use the GASS Library [default=no]" ac_help="$ac_help - --with-srb=INC,LIB Use the SRB Library [default=no]" -ac_help="$ac_help --with-gridstorage=INC,LIB Use the Globus Grid Storage driver [default=no]" ac_help="$ac_help + --with-ssl=LIB Use SSL libs from LIB " +ac_help="$ac_help + --with-srb=INC,LIB Use the SRB Library [default=no]" +ac_help="$ac_help --with-pthread=INC,LIB Use the Pthreads library" ac_help="$ac_help --enable-threadsafe Enable thread safe capability" @@ -5046,7 +5046,6 @@ fi ;; esac - # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then withval="$with_zlib" @@ -5055,9 +5054,10 @@ else withval=yes fi + case $withval in - yes) - for ac_hdr in zlib.h + yes) + for ac_hdr in zlib.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -5097,7 +5097,7 @@ else fi done - echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6 + echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6 echo "configure:5102: checking for compress in -lz" >&5 ac_lib_var=`echo z'_'compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then @@ -5144,18 +5144,18 @@ else echo "$ac_t""no" 1>&6 fi - ;; - no) - echo $ac_n "checking for GNU zlib""... $ac_c" 1>&6 + ;; + no) + echo $ac_n "checking for GNU zlib""... $ac_c" 1>&6 echo "configure:5151: checking for GNU zlib" >&5 - echo "$ac_t""suppressed" 1>&6 - ;; - *) - zlib_inc="`echo $withval |cut -f1 -d,`" - if test -n "$zlib_inc"; then - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$zlib_inc" - for ac_hdr in zlib.h + echo "$ac_t""suppressed" 1>&6 + ;; + *) + zlib_inc="`echo $withval |cut -f1 -d,`" + if test -n "$zlib_inc"; then + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I$zlib_inc" + for ac_hdr in zlib.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -5196,8 +5196,8 @@ CPPFLAGS="$saved_CPPFLAGS" fi done - else - for ac_hdr in zlib.h + else + for ac_hdr in zlib.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -5237,14 +5237,15 @@ else fi done - fi + fi - zlib_lib="`echo $withval |cut -f2 -d, -s`" - if test -n "$zlib_lib"; then - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$zlib_lib" - echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6 -echo "configure:5248: checking for compress in -lz" >&5 + zlib_lib="`echo $withval |cut -f2 -d, -s`" + + if test -n "$zlib_lib"; then + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$zlib_lib" + echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6 +echo "configure:5249: checking for compress in -lz" >&5 ac_lib_var=`echo z'_'compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5252,7 +5253,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5291,9 +5292,9 @@ else LDFLAGS="$saved_LDFLAGS" fi - else - echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6 -echo "configure:5297: checking for compress in -lz" >&5 + else + echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6 +echo "configure:5298: checking for compress in -lz" >&5 ac_lib_var=`echo z'_'compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5301,7 +5302,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5339,114 +5340,10 @@ else echo "$ac_t""no" 1>&6 fi - fi - ;; + fi + ;; esac - SSL=yes -# Check whether --with-ssl or --without-ssl was given. -if test "${with_ssl+set}" = set; then - withval="$with_ssl" - : -fi - -if test -n "$with_ssl"; then - LDFLAGS="$LDFLAGS -L$with_ssl" -fi - -echo $ac_n "checking for main in -lcrypto""... $ac_c" 1>&6 -echo "configure:5359: checking for main in -lcrypto" >&5 -ac_lib_var=`echo crypto'_'main | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lcrypto $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo crypto | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -unset SSL -fi - -echo $ac_n "checking for SSL_get_version in -lssl""... $ac_c" 1>&6 -echo "configure:5403: checking for SSL_get_version in -lssl" >&5 -ac_lib_var=`echo ssl'_'SSL_get_version | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lssl $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo ssl | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -unset SSL -fi - - GASS=yes TESTGASS='$(srcdir)/testgass' # Check whether --with-gass or --without-gass was given. @@ -5459,22 +5356,22 @@ fi case "$withval" in - yes) - for ac_hdr in globus_common.h + yes) + for ac_hdr in globus_common.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5468: checking for $ac_hdr" >&5 +echo "configure:5365: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5478: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5375: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5501,8 +5398,8 @@ unset GASS TESTGASS fi done - echo $ac_n "checking for globus_module_activate in -lglobus_common""... $ac_c" 1>&6 -echo "configure:5506: checking for globus_module_activate in -lglobus_common" >&5 + echo $ac_n "checking for globus_module_activate in -lglobus_common""... $ac_c" 1>&6 +echo "configure:5403: checking for globus_module_activate in -lglobus_common" >&5 ac_lib_var=`echo globus_common'_'globus_module_activate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5510,7 +5407,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_common $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5549,8 +5446,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gass_cache""... $ac_c" 1>&6 -echo "configure:5554: checking for main in -lglobus_gass_cache" >&5 + echo $ac_n "checking for main in -lglobus_gass_cache""... $ac_c" 1>&6 +echo "configure:5451: checking for main in -lglobus_gass_cache" >&5 ac_lib_var=`echo globus_gass_cache'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5558,14 +5455,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_cache $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5593,8 +5490,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gaa""... $ac_c" 1>&6 -echo "configure:5598: checking for main in -lglobus_gaa" >&5 + echo $ac_n "checking for main in -lglobus_gaa""... $ac_c" 1>&6 +echo "configure:5495: checking for main in -lglobus_gaa" >&5 ac_lib_var=`echo globus_gaa'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5602,14 +5499,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gaa $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5637,8 +5534,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gss""... $ac_c" 1>&6 -echo "configure:5642: checking for main in -lglobus_gss" >&5 + echo $ac_n "checking for main in -lglobus_gss""... $ac_c" 1>&6 +echo "configure:5539: checking for main in -lglobus_gss" >&5 ac_lib_var=`echo globus_gss'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5646,14 +5543,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gss $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5681,8 +5578,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gss_assist""... $ac_c" 1>&6 -echo "configure:5686: checking for main in -lglobus_gss_assist" >&5 + echo $ac_n "checking for main in -lglobus_gss_assist""... $ac_c" 1>&6 +echo "configure:5583: checking for main in -lglobus_gss_assist" >&5 ac_lib_var=`echo globus_gss_assist'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5690,14 +5587,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gss_assist $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5725,8 +5622,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_io""... $ac_c" 1>&6 -echo "configure:5730: checking for main in -lglobus_io" >&5 + echo $ac_n "checking for main in -lglobus_io""... $ac_c" 1>&6 +echo "configure:5627: checking for main in -lglobus_io" >&5 ac_lib_var=`echo globus_io'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5734,14 +5631,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_io $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5769,8 +5666,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gass_transfer_assist""... $ac_c" 1>&6 -echo "configure:5774: checking for main in -lglobus_gass_transfer_assist" >&5 + echo $ac_n "checking for main in -lglobus_gass_transfer_assist""... $ac_c" 1>&6 +echo "configure:5671: checking for main in -lglobus_gass_transfer_assist" >&5 ac_lib_var=`echo globus_gass_transfer_assist'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5778,14 +5675,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_transfer_assist $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5813,8 +5710,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gass_transfer""... $ac_c" 1>&6 -echo "configure:5818: checking for main in -lglobus_gass_transfer" >&5 + echo $ac_n "checking for main in -lglobus_gass_transfer""... $ac_c" 1>&6 +echo "configure:5715: checking for main in -lglobus_gass_transfer" >&5 ac_lib_var=`echo globus_gass_transfer'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5822,14 +5719,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_transfer $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5857,8 +5754,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for globus_gass_open in -lglobus_gass_file""... $ac_c" 1>&6 -echo "configure:5862: checking for globus_gass_open in -lglobus_gass_file" >&5 + echo $ac_n "checking for globus_gass_open in -lglobus_gass_file""... $ac_c" 1>&6 +echo "configure:5759: checking for globus_gass_open in -lglobus_gass_file" >&5 ac_lib_var=`echo globus_gass_file'_'globus_gass_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5866,7 +5763,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_file $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5905,33 +5802,34 @@ else unset GASS TESTGASS fi - ;; - no) - echo $ac_n "checking for GASS""... $ac_c" 1>&6 -echo "configure:5912: checking for GASS" >&5 - echo "$ac_t""suppressed" 1>&6 - unset GASS TESTGASS - ;; - *) - gass_inc="`echo $withval |cut -f1 -d,`" - if test -n "$gass_inc"; then - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$gass_inc" - for ac_hdr in globus_common.h + ;; + no) + echo $ac_n "checking for GASS""... $ac_c" 1>&6 +echo "configure:5809: checking for GASS" >&5 + echo "$ac_t""suppressed" 1>&6 + unset GASS TESTGASS + ;; + *) + gass_inc="`echo $withval |cut -f1 -d,`" + + if test -n "$gass_inc"; then + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I$gass_inc" + for ac_hdr in globus_common.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5925: checking for $ac_hdr" >&5 +echo "configure:5823: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5935: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5833: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5955,26 +5853,26 @@ EOF else echo "$ac_t""no" 1>&6 CPPFLAGS="$saved_CPPFLAGS" - unset GASS TESTGASS + unset GASS TESTGASS fi done - else - for ac_hdr in globus_common.h + else + for ac_hdr in globus_common.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5968: checking for $ac_hdr" >&5 +echo "configure:5866: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5978: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6000,14 +5898,15 @@ else fi done - fi - - gass_lib="`echo $withval |cut -f2 -d, -s`" - if test -n "$gass_lib"; then - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$gass_lib" - echo $ac_n "checking for globus_module_activate in -lglobus_common""... $ac_c" 1>&6 -echo "configure:6011: checking for globus_module_activate in -lglobus_common" >&5 + fi + + gass_lib="`echo $withval |cut -f2 -d, -s`" + + if test -n "$gass_lib"; then + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$gass_lib" + echo $ac_n "checking for globus_module_activate in -lglobus_common""... $ac_c" 1>&6 +echo "configure:5910: checking for globus_module_activate in -lglobus_common" >&5 ac_lib_var=`echo globus_common'_'globus_module_activate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6015,7 +5914,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_common $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6054,8 +5953,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gass_cache""... $ac_c" 1>&6 -echo "configure:6059: checking for main in -lglobus_gass_cache" >&5 + echo $ac_n "checking for main in -lglobus_gass_cache""... $ac_c" 1>&6 +echo "configure:5958: checking for main in -lglobus_gass_cache" >&5 ac_lib_var=`echo globus_gass_cache'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6063,14 +5962,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_cache $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6098,8 +5997,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gaa""... $ac_c" 1>&6 -echo "configure:6103: checking for main in -lglobus_gaa" >&5 + echo $ac_n "checking for main in -lglobus_gaa""... $ac_c" 1>&6 +echo "configure:6002: checking for main in -lglobus_gaa" >&5 ac_lib_var=`echo globus_gaa'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6107,14 +6006,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gaa $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6142,8 +6041,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gss""... $ac_c" 1>&6 -echo "configure:6147: checking for main in -lglobus_gss" >&5 + echo $ac_n "checking for main in -lglobus_gss""... $ac_c" 1>&6 +echo "configure:6046: checking for main in -lglobus_gss" >&5 ac_lib_var=`echo globus_gss'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6151,14 +6050,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gss $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6186,8 +6085,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gss_assist""... $ac_c" 1>&6 -echo "configure:6191: checking for main in -lglobus_gss_assist" >&5 + echo $ac_n "checking for main in -lglobus_gss_assist""... $ac_c" 1>&6 +echo "configure:6090: checking for main in -lglobus_gss_assist" >&5 ac_lib_var=`echo globus_gss_assist'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6195,14 +6094,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gss_assist $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6230,8 +6129,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_io""... $ac_c" 1>&6 -echo "configure:6235: checking for main in -lglobus_io" >&5 + echo $ac_n "checking for main in -lglobus_io""... $ac_c" 1>&6 +echo "configure:6134: checking for main in -lglobus_io" >&5 ac_lib_var=`echo globus_io'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6239,14 +6138,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_io $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6274,8 +6173,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gass_transfer_assist""... $ac_c" 1>&6 -echo "configure:6279: checking for main in -lglobus_gass_transfer_assist" >&5 + echo $ac_n "checking for main in -lglobus_gass_transfer_assist""... $ac_c" 1>&6 +echo "configure:6178: checking for main in -lglobus_gass_transfer_assist" >&5 ac_lib_var=`echo globus_gass_transfer_assist'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6283,14 +6182,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_transfer_assist $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6318,8 +6217,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gass_transfer""... $ac_c" 1>&6 -echo "configure:6323: checking for main in -lglobus_gass_transfer" >&5 + echo $ac_n "checking for main in -lglobus_gass_transfer""... $ac_c" 1>&6 +echo "configure:6222: checking for main in -lglobus_gass_transfer" >&5 ac_lib_var=`echo globus_gass_transfer'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6327,14 +6226,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_transfer $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6362,8 +6261,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for globus_gass_open in -lglobus_gass_file""... $ac_c" 1>&6 -echo "configure:6367: checking for globus_gass_open in -lglobus_gass_file" >&5 + echo $ac_n "checking for globus_gass_open in -lglobus_gass_file""... $ac_c" 1>&6 +echo "configure:6266: checking for globus_gass_open in -lglobus_gass_file" >&5 ac_lib_var=`echo globus_gass_file'_'globus_gass_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6371,7 +6270,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_file $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6410,9 +6309,9 @@ else unset GASS TESTGASS fi - else - echo $ac_n "checking for globus_module_activate in -lglobus_common""... $ac_c" 1>&6 -echo "configure:6416: checking for globus_module_activate in -lglobus_common" >&5 + else + echo $ac_n "checking for globus_module_activate in -lglobus_common""... $ac_c" 1>&6 +echo "configure:6315: checking for globus_module_activate in -lglobus_common" >&5 ac_lib_var=`echo globus_common'_'globus_module_activate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6420,7 +6319,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_common $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6459,8 +6358,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gass_cache""... $ac_c" 1>&6 -echo "configure:6464: checking for main in -lglobus_gass_cache" >&5 + echo $ac_n "checking for main in -lglobus_gass_cache""... $ac_c" 1>&6 +echo "configure:6363: checking for main in -lglobus_gass_cache" >&5 ac_lib_var=`echo globus_gass_cache'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6468,14 +6367,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_cache $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6503,8 +6402,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gaa""... $ac_c" 1>&6 -echo "configure:6508: checking for main in -lglobus_gaa" >&5 + echo $ac_n "checking for main in -lglobus_gaa""... $ac_c" 1>&6 +echo "configure:6407: checking for main in -lglobus_gaa" >&5 ac_lib_var=`echo globus_gaa'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6512,14 +6411,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gaa $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6547,8 +6446,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gss""... $ac_c" 1>&6 -echo "configure:6552: checking for main in -lglobus_gss" >&5 + echo $ac_n "checking for main in -lglobus_gss""... $ac_c" 1>&6 +echo "configure:6451: checking for main in -lglobus_gss" >&5 ac_lib_var=`echo globus_gss'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6556,14 +6455,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gss $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6591,8 +6490,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gss_assist""... $ac_c" 1>&6 -echo "configure:6596: checking for main in -lglobus_gss_assist" >&5 + echo $ac_n "checking for main in -lglobus_gss_assist""... $ac_c" 1>&6 +echo "configure:6495: checking for main in -lglobus_gss_assist" >&5 ac_lib_var=`echo globus_gss_assist'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6600,14 +6499,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gss_assist $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6635,8 +6534,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_io""... $ac_c" 1>&6 -echo "configure:6640: checking for main in -lglobus_io" >&5 + echo $ac_n "checking for main in -lglobus_io""... $ac_c" 1>&6 +echo "configure:6539: checking for main in -lglobus_io" >&5 ac_lib_var=`echo globus_io'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6644,14 +6543,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_io $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6679,8 +6578,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gass_transfer_assist""... $ac_c" 1>&6 -echo "configure:6684: checking for main in -lglobus_gass_transfer_assist" >&5 + echo $ac_n "checking for main in -lglobus_gass_transfer_assist""... $ac_c" 1>&6 +echo "configure:6583: checking for main in -lglobus_gass_transfer_assist" >&5 ac_lib_var=`echo globus_gass_transfer_assist'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6688,14 +6587,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_transfer_assist $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6723,8 +6622,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for main in -lglobus_gass_transfer""... $ac_c" 1>&6 -echo "configure:6728: checking for main in -lglobus_gass_transfer" >&5 + echo $ac_n "checking for main in -lglobus_gass_transfer""... $ac_c" 1>&6 +echo "configure:6627: checking for main in -lglobus_gass_transfer" >&5 ac_lib_var=`echo globus_gass_transfer'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6732,14 +6631,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_transfer $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6767,8 +6666,8 @@ else unset GASS TESTGASS fi - echo $ac_n "checking for globus_gass_open in -lglobus_gass_file""... $ac_c" 1>&6 -echo "configure:6772: checking for globus_gass_open in -lglobus_gass_file" >&5 + echo $ac_n "checking for globus_gass_open in -lglobus_gass_file""... $ac_c" 1>&6 +echo "configure:6671: checking for globus_gass_open in -lglobus_gass_file" >&5 ac_lib_var=`echo globus_gass_file'_'globus_gass_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6776,7 +6675,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_file $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6815,22 +6714,22 @@ else unset GASS TESTGASS fi - fi - ;; + fi + ;; esac if test -n "$GASS"; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_GASS 1 EOF fi - SRB=yes - TESTSRB='$(srcdir)/testsrb' -# Check whether --with-srb or --without-srb was given. -if test "${with_srb+set}" = set; then - withval="$with_srb" + GRIDSTORAGE=yes + TESTGRIDSTORAGE='$(srcdir)/testgridstorage' +# Check whether --with-gridstorage or --without-gridstorage was given. +if test "${with_gridstorage+set}" = set; then + withval="$with_gridstorage" : else withval=no @@ -6838,22 +6737,22 @@ fi case "$withval" in - yes) - for ac_hdr in srbClient.h + yes) + for ac_hdr in grid_storage_file.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6847: checking for $ac_hdr" >&5 +echo "configure:6746: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6857: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6756: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6876,27 +6775,27 @@ EOF else echo "$ac_t""no" 1>&6 -unset SRB TESTSRB +unset GRIDSTORAGE TESTGRIDSTORAGE fi done - echo $ac_n "checking for main in -lelf""... $ac_c" 1>&6 -echo "configure:6885: checking for main in -lelf" >&5 -ac_lib_var=`echo elf'_'main | sed 'y%./+-%__p_%'` + echo $ac_n "checking for main in -lgrid_storage_client""... $ac_c" 1>&6 +echo "configure:6784: checking for main in -lgrid_storage_client" >&5 +ac_lib_var=`echo grid_storage_client'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lelf $LIBS" +LIBS="-lgrid_storage_client $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6911,36 +6810,40 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo elf | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + ac_tr_lib=HAVE_LIB`echo grid_storage_client | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` cat >> confdefs.h <&6 -unset SRB TESTSRB +unset GRIDSTORAGE TESTGRIDSTORAGE fi - echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:6929: checking for main in -lsocket" >&5 -ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` + echo $ac_n "checking for grid_storage_open in -lgrid_storage_file""... $ac_c" 1>&6 +echo "configure:6828: checking for grid_storage_open in -lgrid_storage_file" >&5 +ac_lib_var=`echo grid_storage_file'_'grid_storage_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lsocket $LIBS" +LIBS="-lgrid_storage_file $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6955,104 +6858,57 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + ac_tr_lib=HAVE_LIB`echo grid_storage_file | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` cat >> confdefs.h <&6 -unset SRB TESTSRB +unset GRIDSTORAGE TESTGRIDSTORAGE fi - echo $ac_n "checking for clConnect in -lSrbClient""... $ac_c" 1>&6 -echo "configure:6973: checking for clConnect in -lSrbClient" >&5 -ac_lib_var=`echo SrbClient'_'clConnect | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + ;; + no) + echo $ac_n "checking for GRIDSTORAGE""... $ac_c" 1>&6 +echo "configure:6878: checking for GRIDSTORAGE" >&5 + echo "$ac_t""suppressed" 1>&6 + unset GRIDSTORAGE TESTGRIDSTORAGE + ;; + *) + gridstorage_inc="`echo $withval |cut -f1 -d,`" + + if test -n "$gridstorage_inc"; then + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I$gridstorage_inc" + for ac_hdr in grid_storage_file.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:6892: checking for $ac_hdr" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - ac_save_LIBS="$LIBS" -LIBS="-lSrbClient $LIBS" -cat > conftest.$ac_ext < conftest.$ac_ext < EOF -if { (eval echo configure:6992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:6902: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" + eval "ac_cv_header_$ac_safe=yes" else + echo "$ac_err" >&5 echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo SrbClient | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -unset SRB TESTSRB -fi - - ;; - no) - echo $ac_n "checking for SRB""... $ac_c" 1>&6 -echo "configure:7023: checking for SRB" >&5 - echo "$ac_t""suppressed" 1>&6 - unset SRB TESTSRB - ;; - *) - srb_inc="`echo $withval |cut -f1 -d,`" - if test -n "$srb_inc"; then - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$srb_inc" - for ac_hdr in srbClient.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7036: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7046: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + eval "ac_cv_header_$ac_safe=no" fi rm -f conftest* fi @@ -7066,26 +6922,26 @@ EOF else echo "$ac_t""no" 1>&6 CPPFLAGS="$saved_CPPFLAGS" - unset SRB TESTSRB + unset GRIDSTORAGE TESTGRIDSTORAGE fi done - else - for ac_hdr in srbClient.h + else + for ac_hdr in grid_storage_file.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7079: checking for $ac_hdr" >&5 +echo "configure:6935: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7089: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7111,29 +6967,30 @@ else fi done - fi + fi - srb_lib="`echo $withval |cut -f2 -d, -s`" - if test -n "$srb_lib"; then - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$srb_lib" - echo $ac_n "checking for main in -lelf""... $ac_c" 1>&6 -echo "configure:7122: checking for main in -lelf" >&5 -ac_lib_var=`echo elf'_'main | sed 'y%./+-%__p_%'` + gridstorage_lib="`echo $withval |cut -f2 -d, -s`" + + if test -n "$gridstorage_lib"; then + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$gridstorage_lib" + echo $ac_n "checking for main in -lgrid_storage_client""... $ac_c" 1>&6 +echo "configure:6979: checking for main in -lgrid_storage_client" >&5 +ac_lib_var=`echo grid_storage_client'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lelf $LIBS" +LIBS="-lgrid_storage_client $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7148,36 +7005,40 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo elf | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + ac_tr_lib=HAVE_LIB`echo grid_storage_client | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` cat >> confdefs.h <&6 -unset SRB TESTSRB +unset GRIDSTORAGE TESTGRIDSTORAGE fi - echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:7166: checking for main in -lsocket" >&5 -ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` + echo $ac_n "checking for grid_storage_open in -lgrid_storage_file""... $ac_c" 1>&6 +echo "configure:7023: checking for grid_storage_open in -lgrid_storage_file" >&5 +ac_lib_var=`echo grid_storage_file'_'grid_storage_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lsocket $LIBS" +LIBS="-lgrid_storage_file $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7192,40 +7053,37 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + ac_tr_lib=HAVE_LIB`echo grid_storage_file | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` cat >> confdefs.h <&6 -unset SRB TESTSRB +unset GRIDSTORAGE TESTGRIDSTORAGE fi - echo $ac_n "checking for clConnect in -lSrbClient""... $ac_c" 1>&6 -echo "configure:7210: checking for clConnect in -lSrbClient" >&5 -ac_lib_var=`echo SrbClient'_'clConnect | sed 'y%./+-%__p_%'` + else + echo $ac_n "checking for main in -lgrid_storage_client""... $ac_c" 1>&6 +echo "configure:7072: checking for main in -lgrid_storage_client" >&5 +ac_lib_var=`echo grid_storage_client'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lSrbClient $LIBS" +LIBS="-lgrid_storage_client $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7240,37 +7098,40 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo SrbClient | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + ac_tr_lib=HAVE_LIB`echo grid_storage_client | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` cat >> confdefs.h <&6 -unset SRB TESTSRB +unset GRIDSTORAGE TESTGRIDSTORAGE fi - else - echo $ac_n "checking for main in -lelf""... $ac_c" 1>&6 -echo "configure:7259: checking for main in -lelf" >&5 -ac_lib_var=`echo elf'_'main | sed 'y%./+-%__p_%'` + echo $ac_n "checking for grid_storage_open in -lgrid_storage_file""... $ac_c" 1>&6 +echo "configure:7116: checking for grid_storage_open in -lgrid_storage_file" >&5 +ac_lib_var=`echo grid_storage_file'_'grid_storage_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lelf $LIBS" +LIBS="-lgrid_storage_file $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7285,36 +7146,60 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo elf | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + ac_tr_lib=HAVE_LIB`echo grid_storage_file | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` cat >> confdefs.h <&6 -unset SRB TESTSRB +unset GRIDSTORAGE TESTGRIDSTORAGE fi - echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:7303: checking for main in -lsocket" >&5 -ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` + fi + ;; +esac + +if test -n "$GRIDSTORAGE"; then + cat >> confdefs.h <<\EOF +#define HAVE_GRIDSTORAGE 1 +EOF + +fi + +if test -n "$GRIDSTORAGE" -o -n "$GASS"; then + SSL=yes + # Check whether --with-ssl or --without-ssl was given. +if test "${with_ssl+set}" = set; then + withval="$with_ssl" + : +fi + + + if test -n "$with_ssl"; then + LDFLAGS="$LDFLAGS -L$with_ssl" + fi + + echo $ac_n "checking for main in -lcrypto""... $ac_c" 1>&6 +echo "configure:7188: checking for main in -lcrypto" >&5 +ac_lib_var=`echo crypto'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lsocket $LIBS" +LIBS="-lcrypto $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7329,40 +7214,40 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + ac_tr_lib=HAVE_LIB`echo crypto | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` cat >> confdefs.h <&6 -unset SRB TESTSRB +unset SSL fi - echo $ac_n "checking for clConnect in -lSrbClient""... $ac_c" 1>&6 -echo "configure:7347: checking for clConnect in -lSrbClient" >&5 -ac_lib_var=`echo SrbClient'_'clConnect | sed 'y%./+-%__p_%'` + echo $ac_n "checking for SSL_get_version in -lssl""... $ac_c" 1>&6 +echo "configure:7232: checking for SSL_get_version in -lssl" >&5 +ac_lib_var=`echo ssl'_'SSL_get_version | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lSrbClient $LIBS" +LIBS="-lssl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7377,34 +7262,26 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo SrbClient | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + ac_tr_lib=HAVE_LIB`echo ssl | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` cat >> confdefs.h <&6 -unset SRB TESTSRB +unset SSL fi - fi - ;; -esac -if test -n "$SRB"; then - cat >> confdefs.h <<\EOF -#define HAVE_SRB 1 -EOF - fi - GRIDSTORAGE=yes - TESTGRIDSTORAGE='$(srcdir)/testgridstorage' -# Check whether --with-gridstorage or --without-gridstorage was given. -if test "${with_gridstorage+set}" = set; then - withval="$with_gridstorage" + SRB=yes + TESTSRB='$(srcdir)/testsrb' +# Check whether --with-srb or --without-srb was given. +if test "${with_srb+set}" = set; then + withval="$with_srb" : else withval=no @@ -7412,22 +7289,22 @@ fi case "$withval" in - yes) - for ac_hdr in grid_storage_file.h + yes) + for ac_hdr in srbClient.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7421: checking for $ac_hdr" >&5 +echo "configure:7298: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7431: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7308: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7450,27 +7327,27 @@ EOF else echo "$ac_t""no" 1>&6 -unset GRIDSTORAGE TESTGRIDSTORAGE +unset SRB TESTSRB fi done - echo $ac_n "checking for main in -lgrid_storage_client""... $ac_c" 1>&6 -echo "configure:7459: checking for main in -lgrid_storage_client" >&5 -ac_lib_var=`echo grid_storage_client'_'main | sed 'y%./+-%__p_%'` + echo $ac_n "checking for main in -lelf""... $ac_c" 1>&6 +echo "configure:7336: checking for main in -lelf" >&5 +ac_lib_var=`echo elf'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lgrid_storage_client $LIBS" +LIBS="-lelf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7485,40 +7362,84 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo grid_storage_client | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + ac_tr_lib=HAVE_LIB`echo elf | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` cat >> confdefs.h <&6 -unset GRIDSTORAGE TESTGRIDSTORAGE +unset SRB TESTSRB fi - echo $ac_n "checking for grid_storage_open in -lgrid_storage_file""... $ac_c" 1>&6 -echo "configure:7503: checking for grid_storage_open in -lgrid_storage_file" >&5 -ac_lib_var=`echo grid_storage_file'_'grid_storage_open | sed 'y%./+-%__p_%'` + echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 +echo "configure:7380: checking for main in -lsocket" >&5 +ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lgrid_storage_file $LIBS" +LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +unset SRB TESTSRB +fi + + echo $ac_n "checking for clConnect in -lSrbClient""... $ac_c" 1>&6 +echo "configure:7424: checking for clConnect in -lSrbClient" >&5 +ac_lib_var=`echo SrbClient'_'clConnect | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lSrbClient $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7533,46 +7454,46 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo grid_storage_file | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + ac_tr_lib=HAVE_LIB`echo SrbClient | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` cat >> confdefs.h <&6 -unset GRIDSTORAGE TESTGRIDSTORAGE +unset SRB TESTSRB fi - ;; - no) - echo $ac_n "checking for GRIDSTORAGE""... $ac_c" 1>&6 -echo "configure:7553: checking for GRIDSTORAGE" >&5 - echo "$ac_t""suppressed" 1>&6 - unset GRIDSTORAGE TESTGRIDSTORAGE - ;; - *) - gridstorage_inc="`echo $withval |cut -f1 -d,`" - if test -n "$gridstorage_inc"; then - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$gridstorage_inc" - for ac_hdr in grid_storage_file.h + ;; + no) + echo $ac_n "checking for SRB""... $ac_c" 1>&6 +echo "configure:7474: checking for SRB" >&5 + echo "$ac_t""suppressed" 1>&6 + unset SRB TESTSRB + ;; + *) + srb_inc="`echo $withval |cut -f1 -d,`" + if test -n "$srb_inc"; then + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I$srb_inc" + for ac_hdr in srbClient.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7566: checking for $ac_hdr" >&5 +echo "configure:7487: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7576: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7596,26 +7517,26 @@ EOF else echo "$ac_t""no" 1>&6 CPPFLAGS="$saved_CPPFLAGS" - unset GRIDSTORAGE TESTGRIDSTORAGE + unset SRB TESTSRB fi done - else - for ac_hdr in grid_storage_file.h + else + for ac_hdr in srbClient.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7609: checking for $ac_hdr" >&5 +echo "configure:7530: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7619: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7540: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7641,29 +7562,30 @@ else fi done - fi - - gridstorage_lib="`echo $withval |cut -f2 -d, -s`" - if test -n "$gridstorage_lib"; then - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$gridstorage_lib" - echo $ac_n "checking for main in -lgrid_storage_client""... $ac_c" 1>&6 -echo "configure:7652: checking for main in -lgrid_storage_client" >&5 -ac_lib_var=`echo grid_storage_client'_'main | sed 'y%./+-%__p_%'` + fi + + srb_lib="`echo $withval |cut -f2 -d, -s`" + + if test -n "$srb_lib"; then + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$srb_lib" + echo $ac_n "checking for main in -lelf""... $ac_c" 1>&6 +echo "configure:7574: checking for main in -lelf" >&5 +ac_lib_var=`echo elf'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lgrid_storage_client $LIBS" +LIBS="-lelf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7678,40 +7600,84 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo grid_storage_client | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + ac_tr_lib=HAVE_LIB`echo elf | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` cat >> confdefs.h <&6 -unset GRIDSTORAGE TESTGRIDSTORAGE +unset SRB TESTSRB fi - echo $ac_n "checking for grid_storage_open in -lgrid_storage_file""... $ac_c" 1>&6 -echo "configure:7696: checking for grid_storage_open in -lgrid_storage_file" >&5 -ac_lib_var=`echo grid_storage_file'_'grid_storage_open | sed 'y%./+-%__p_%'` + echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 +echo "configure:7618: checking for main in -lsocket" >&5 +ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lgrid_storage_file $LIBS" +LIBS="-lsocket $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +unset SRB TESTSRB +fi + + echo $ac_n "checking for clConnect in -lSrbClient""... $ac_c" 1>&6 +echo "configure:7662: checking for clConnect in -lSrbClient" >&5 +ac_lib_var=`echo SrbClient'_'clConnect | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lSrbClient $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7726,37 +7692,37 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo grid_storage_file | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + ac_tr_lib=HAVE_LIB`echo SrbClient | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` cat >> confdefs.h <&6 -unset GRIDSTORAGE TESTGRIDSTORAGE +unset SRB TESTSRB fi - else - echo $ac_n "checking for main in -lgrid_storage_client""... $ac_c" 1>&6 -echo "configure:7745: checking for main in -lgrid_storage_client" >&5 -ac_lib_var=`echo grid_storage_client'_'main | sed 'y%./+-%__p_%'` + else + echo $ac_n "checking for main in -lelf""... $ac_c" 1>&6 +echo "configure:7711: checking for main in -lelf" >&5 +ac_lib_var=`echo elf'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lgrid_storage_client $LIBS" +LIBS="-lelf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7771,40 +7737,84 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo grid_storage_client | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + ac_tr_lib=HAVE_LIB`echo elf | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` cat >> confdefs.h <&6 -unset GRIDSTORAGE TESTGRIDSTORAGE +unset SRB TESTSRB fi - echo $ac_n "checking for grid_storage_open in -lgrid_storage_file""... $ac_c" 1>&6 -echo "configure:7789: checking for grid_storage_open in -lgrid_storage_file" >&5 -ac_lib_var=`echo grid_storage_file'_'grid_storage_open | sed 'y%./+-%__p_%'` + echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 +echo "configure:7755: checking for main in -lsocket" >&5 +ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lgrid_storage_file $LIBS" +LIBS="-lsocket $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +unset SRB TESTSRB +fi + + echo $ac_n "checking for clConnect in -lSrbClient""... $ac_c" 1>&6 +echo "configure:7799: checking for clConnect in -lSrbClient" >&5 +ac_lib_var=`echo SrbClient'_'clConnect | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lSrbClient $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7819,33 +7829,33 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo grid_storage_file | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + ac_tr_lib=HAVE_LIB`echo SrbClient | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` cat >> confdefs.h <&6 -unset GRIDSTORAGE TESTGRIDSTORAGE +unset SRB TESTSRB fi - fi - ;; + fi + ;; esac -if test -n "$GRIDSTORAGE"; then - cat >> confdefs.h <<\EOF -#define HAVE_GRIDSTORAGE 1 +if test -n "$SRB"; then + cat >> confdefs.h <<\EOF +#define HAVE_SRB 1 EOF fi echo $ac_n "checking for PD_open in -lpdb""... $ac_c" 1>&6 -echo "configure:7849: checking for PD_open in -lpdb" >&5 +echo "configure:7859: checking for PD_open in -lpdb" >&5 ac_lib_var=`echo pdb'_'PD_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7853,7 +7863,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpdb $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7892,7 +7902,7 @@ else fi echo $ac_n "checking for lite_PD_open in -lsilo""... $ac_c" 1>&6 -echo "configure:7896: checking for lite_PD_open in -lsilo" >&5 +echo "configure:7906: checking for lite_PD_open in -lsilo" >&5 ac_lib_var=`echo silo'_'lite_PD_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7900,7 +7910,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsilo $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7942,17 +7952,17 @@ for ac_hdr in pdb.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7946: checking for $ac_hdr" >&5 +echo "configure:7956: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7956: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8044,17 +8054,17 @@ case "$withval" in do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8048: checking for $ac_hdr" >&5 +echo "configure:8058: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8058: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8068: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8082,7 +8092,7 @@ done if test `uname` != "FreeBSD"; then echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:8086: checking for pthread_create in -lpthread" >&5 +echo "configure:8096: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8090,7 +8100,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8136,7 +8146,7 @@ fi ;; no) echo $ac_n "checking for pthread""... $ac_c" 1>&6 -echo "configure:8140: checking for pthread" >&5 +echo "configure:8150: checking for pthread" >&5 echo "$ac_t""suppressed" 1>&6 unset PTHREAD ;; @@ -8149,17 +8159,17 @@ echo "configure:8140: checking for pthread" >&5 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8153: checking for $ac_hdr" >&5 +echo "configure:8163: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8163: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8191,17 +8201,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8195: checking for $ac_hdr" >&5 +echo "configure:8205: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8215: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8235,7 +8245,7 @@ done saved_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -L$pthread_lib" echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:8239: checking for pthread_create in -lpthread" >&5 +echo "configure:8249: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8243,7 +8253,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8284,7 +8294,7 @@ fi else echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:8288: checking for pthread_create in -lpthread" >&5 +echo "configure:8298: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8292,7 +8302,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8336,7 +8346,7 @@ fi esac echo $ac_n "checking for thread safe support""... $ac_c" 1>&6 -echo "configure:8340: checking for thread safe support" >&5 +echo "configure:8350: checking for thread safe support" >&5 # Check whether --enable-threadsafe or --disable-threadsafe was given. if test "${enable_threadsafe+set}" = set; then enableval="$enable_threadsafe" @@ -8371,7 +8381,7 @@ EOF fi echo $ac_n "checking whether HDF5 v1.2 compatibility functions enabled""... $ac_c" 1>&6 -echo "configure:8375: checking whether HDF5 v1.2 compatibility functions enabled" >&5 +echo "configure:8385: checking whether HDF5 v1.2 compatibility functions enabled" >&5 # Check whether --enable-hdf5v1_2 or --disable-hdf5v1_2 was given. if test "${enable_hdf5v1_2+set}" = set; then enableval="$enable_hdf5v1_2" @@ -8390,7 +8400,7 @@ else fi echo $ac_n "checking for Stream Virtual File Driver support""... $ac_c" 1>&6 -echo "configure:8394: checking for Stream Virtual File Driver support" >&5 +echo "configure:8404: checking for Stream Virtual File Driver support" >&5 # Check whether --enable-stream-vfd or --disable-stream-vfd was given. if test "${enable_stream_vfd+set}" = set; then enableval="$enable_stream_vfd" @@ -8404,17 +8414,17 @@ if test "X$STREAM_VFD" = "Xyes"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8408: checking for $ac_hdr" >&5 +echo "configure:8418: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8418: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8446,9 +8456,9 @@ EOF echo $ac_n "checking if socklen_t is defined""... $ac_c" 1>&6 -echo "configure:8450: checking if socklen_t is defined" >&5 +echo "configure:8460: checking if socklen_t is defined" >&5 cat > conftest.$ac_ext < @@ -8467,7 +8477,7 @@ int main() { socklen_t foo; return 0; ; return 0; } EOF -if { (eval echo configure:8471: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_SOCKLEN_T 1 @@ -8487,9 +8497,9 @@ fi echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 -echo "configure:8491: checking for tm_gmtoff in struct tm" >&5 +echo "configure:8501: checking for tm_gmtoff in struct tm" >&5 cat > conftest.$ac_ext < @@ -8498,7 +8508,7 @@ int main() { struct tm tm; tm.tm_gmtoff=0; ; return 0; } EOF -if { (eval echo configure:8502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TM_GMTOFF 1 @@ -8514,9 +8524,9 @@ fi rm -f conftest* echo $ac_n "checking for __tm_gmtoff in struct tm""... $ac_c" 1>&6 -echo "configure:8518: checking for __tm_gmtoff in struct tm" >&5 +echo "configure:8528: checking for __tm_gmtoff in struct tm" >&5 cat > conftest.$ac_ext < @@ -8525,7 +8535,7 @@ int main() { struct tm tm; tm.__tm_gmtoff=0; ; return 0; } EOF -if { (eval echo configure:8529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8539: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE___TM_GMTOFF 1 @@ -8541,9 +8551,9 @@ fi rm -f conftest* echo $ac_n "checking for global timezone variable""... $ac_c" 1>&6 -echo "configure:8545: checking for global timezone variable" >&5 +echo "configure:8555: checking for global timezone variable" >&5 cat > conftest.$ac_ext < @@ -8552,7 +8562,7 @@ int main() { timezone=0; ; return 0; } EOF -if { (eval echo configure:8556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TIMEZONE 1 @@ -8568,12 +8578,12 @@ fi rm -f conftest* echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:8572: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:8582: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -8581,7 +8591,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:8585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8595: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -8602,12 +8612,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:8606: checking for tm_zone in struct tm" >&5 +echo "configure:8616: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_cv_struct_tm> @@ -8615,7 +8625,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:8619: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8629: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -8635,12 +8645,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:8639: checking for tzname" >&5 +echo "configure:8649: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifndef tzname /* For SGI. */ @@ -8650,7 +8660,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:8654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -8672,9 +8682,9 @@ EOF fi echo $ac_n "checking for struct timezone""... $ac_c" 1>&6 -echo "configure:8676: checking for struct timezone" >&5 +echo "configure:8686: checking for struct timezone" >&5 cat > conftest.$ac_ext < @@ -8684,7 +8694,7 @@ int main() { struct timezone tz; tz.tz_minuteswest=0; ; return 0; } EOF -if { (eval echo configure:8688: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STRUCT_TIMEZONE 1 @@ -8700,9 +8710,9 @@ fi rm -f conftest* echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:8704: checking for st_blocks in struct stat" >&5 +echo "configure:8714: checking for st_blocks in struct stat" >&5 cat > conftest.$ac_ext < @@ -8710,7 +8720,7 @@ int main() { struct stat sb; sb.st_blocks=0; ; return 0; } EOF -if { (eval echo configure:8714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STAT_ST_BLOCKS 1 @@ -8728,12 +8738,12 @@ rm -f conftest* for ac_func in _getvideoconfig gettextinfo GetConsoleScreenBufferInfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8732: checking for $ac_func" >&5 +echo "configure:8742: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8783,12 +8793,12 @@ done for ac_func in _scrsize ioctl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8787: checking for $ac_func" >&5 +echo "configure:8797: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8837,16 +8847,16 @@ done echo $ac_n "checking for struct videoconfig""... $ac_c" 1>&6 -echo "configure:8841: checking for struct videoconfig" >&5 +echo "configure:8851: checking for struct videoconfig" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STRUCT_VIDEOCONFIG 1 @@ -8862,16 +8872,16 @@ fi rm -f conftest* echo $ac_n "checking for struct text_info""... $ac_c" 1>&6 -echo "configure:8866: checking for struct text_info" >&5 +echo "configure:8876: checking for struct text_info" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STRUCT_TEXT_INFO 1 @@ -8887,16 +8897,16 @@ fi rm -f conftest* echo $ac_n "checking for TIOCGWINSZ""... $ac_c" 1>&6 -echo "configure:8891: checking for TIOCGWINSZ" >&5 +echo "configure:8901: checking for TIOCGWINSZ" >&5 cat > conftest.$ac_ext < int main() { int w=TIOCGWINSZ; ; return 0; } EOF -if { (eval echo configure:8900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8910: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TIOCGWINSZ 1 @@ -8912,16 +8922,16 @@ fi rm -f conftest* echo $ac_n "checking for TIOCGGETD""... $ac_c" 1>&6 -echo "configure:8916: checking for TIOCGGETD" >&5 +echo "configure:8926: checking for TIOCGGETD" >&5 cat > conftest.$ac_ext < int main() { int w=TIOCGETD; ; return 0; } EOF -if { (eval echo configure:8925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8935: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TIOCGETD 1 @@ -8940,12 +8950,12 @@ rm -f conftest* for ac_func in compress2 difftime fork gethostname getpwuid getrusage do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8944: checking for $ac_func" >&5 +echo "configure:8954: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8995,12 +9005,12 @@ done for ac_func in gettimeofday BSDgettimeofday longjmp setsysinfo sigaction do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8999: checking for $ac_func" >&5 +echo "configure:9009: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9050,12 +9060,12 @@ done for ac_func in signal snprintf vsnprintf strdup system waitpid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9054: checking for $ac_func" >&5 +echo "configure:9064: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9104,12 +9114,12 @@ done echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:9108: checking for working const" >&5 +echo "configure:9118: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9172: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -9179,21 +9189,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:9183: checking for inline" >&5 +echo "configure:9193: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9207: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -9220,16 +9230,16 @@ esac echo $ac_n "checking for __attribute__ extension""... $ac_c" 1>&6 -echo "configure:9224: checking for __attribute__ extension" >&5 +echo "configure:9234: checking for __attribute__ extension" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_ATTRIBUTE 1 @@ -9245,16 +9255,16 @@ fi rm -f conftest* echo $ac_n "checking for __FUNCTION__ extension""... $ac_c" 1>&6 -echo "configure:9249: checking for __FUNCTION__ extension" >&5 +echo "configure:9259: checking for __FUNCTION__ extension" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9268: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_FUNCTION 1 @@ -9270,7 +9280,7 @@ fi rm -f conftest* echo $ac_n "checking how to print long long""... $ac_c" 1>&6 -echo "configure:9274: checking how to print long long" >&5 +echo "configure:9284: checking how to print long long" >&5 if eval "test \"`echo '$''{'hdf5_cv_printf_ll'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9282,7 +9292,7 @@ for hdf5_cv_printf_ll in l L q ll unknown; do continue else cat > conftest.$ac_ext < @@ -9298,7 +9308,7 @@ int main(void) } EOF -if { (eval echo configure:9302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then break else @@ -9319,7 +9329,7 @@ EOF echo $ac_n "checking for debug flags""... $ac_c" 1>&6 -echo "configure:9323: checking for debug flags" >&5 +echo "configure:9333: checking for debug flags" >&5 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then enableval="$enable_debug" @@ -9357,7 +9367,7 @@ if test -n "$DEBUG_PKG"; then fi echo $ac_n "checking for API tracing""... $ac_c" 1>&6 -echo "configure:9361: checking for API tracing" >&5; +echo "configure:9371: checking for API tracing" >&5; # Check whether --enable-trace or --disable-trace was given. if test "${enable_trace+set}" = set; then enableval="$enable_trace" @@ -9433,7 +9443,7 @@ case "$CC_BASENAME" in mpicc) PARALLEL=mpicc echo $ac_n "checking for mpirun""... $ac_c" 1>&6 -echo "configure:9437: checking for mpirun" >&5 +echo "configure:9447: checking for mpirun" >&5 cmd=`echo $CC |cut -f1 -d' '` if (echo $cmd |grep / >/dev/null); then @@ -9460,7 +9470,7 @@ echo "configure:9437: checking for mpirun" >&5 hcc) PARALLEL=hcc echo $ac_n "checking for mpirun_lam or mpirun""... $ac_c" 1>&6 -echo "configure:9464: checking for mpirun_lam or mpirun" >&5 +echo "configure:9474: checking for mpirun_lam or mpirun" >&5 cmd=`echo $CC |cut -f1 -d' '` if (echo $cmd |grep / >/dev/null); then @@ -9505,7 +9515,7 @@ fi echo $ac_n "checking for parallel support files""... $ac_c" 1>&6 -echo "configure:9509: checking for parallel support files" >&5 +echo "configure:9519: checking for parallel support files" >&5 case "X-$enable_parallel" in X-|X-no|X-none) echo "$ac_t""skipped" 1>&6 @@ -9516,21 +9526,21 @@ case "X-$enable_parallel" in PARALLEL=yes cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* echo $ac_n "checking for MPI_Init in -lmpi""... $ac_c" 1>&6 -echo "configure:9534: checking for MPI_Init in -lmpi" >&5 +echo "configure:9544: checking for MPI_Init in -lmpi" >&5 ac_lib_var=`echo mpi'_'MPI_Init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9538,7 +9548,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmpi $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9582,21 +9592,21 @@ rm -f conftest* if test "X$PARALLEL" = "Xyes"; then cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* echo $ac_n "checking for MPI_File_open in -lmpio""... $ac_c" 1>&6 -echo "configure:9600: checking for MPI_File_open in -lmpio" >&5 +echo "configure:9610: checking for MPI_File_open in -lmpio" >&5 ac_lib_var=`echo mpio'_'MPI_File_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9604,7 +9614,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmpio $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9658,7 +9668,7 @@ rm -f conftest* PARALLEL=mpich echo $ac_n "checking for MPI_Init in -lmpich""... $ac_c" 1>&6 -echo "configure:9662: checking for MPI_Init in -lmpich" >&5 +echo "configure:9672: checking for MPI_Init in -lmpich" >&5 ac_lib_var=`echo mpich'_'MPI_Init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9666,7 +9676,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmpich $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9724,23 +9734,23 @@ EOF echo $ac_n "checking prefix for running on one processor""... $ac_c" 1>&6 -echo "configure:9728: checking prefix for running on one processor" >&5 +echo "configure:9738: checking prefix for running on one processor" >&5 echo "$ac_t""$RUNSERIAL" 1>&6 echo $ac_n "checking prefix for running in parallel""... $ac_c" 1>&6 -echo "configure:9731: checking prefix for running in parallel" >&5 +echo "configure:9741: checking prefix for running in parallel" >&5 echo "$ac_t""$RUNPARALLEL" 1>&6 echo $ac_n "checking whether a simple MPI-IO program can be linked""... $ac_c" 1>&6 -echo "configure:9735: checking whether a simple MPI-IO program can be linked" >&5 +echo "configure:9745: checking whether a simple MPI-IO program can be linked" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -9764,12 +9774,12 @@ rm -f conftest* fi echo $ac_n "checking whether a MPI_Get_count works correctly""... $ac_c" 1>&6 -echo "configure:9768: checking whether a MPI_Get_count works correctly" >&5 +echo "configure:9778: checking whether a MPI_Get_count works correctly" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""no" 1>&6 else cat > conftest.$ac_ext < @@ -9790,7 +9800,7 @@ int main(int argc, char **argv) } EOF -if { (eval echo configure:9794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""no" 1>&6 else @@ -10140,13 +10150,13 @@ s%@TESTH5TOH4@%$TESTH5TOH4%g s%@H4TOH5@%$H4TOH5%g s%@H4TOH5TEST@%$H4TOH5TEST%g s%@TESTH4TOH5@%$TESTH4TOH5%g -s%@SSL@%$SSL%g s%@GASS@%$GASS%g s%@TESTGASS@%$TESTGASS%g -s%@SRB@%$SRB%g -s%@TESTSRB@%$TESTSRB%g s%@GRIDSTORAGE@%$GRIDSTORAGE%g s%@TESTGRIDSTORAGE@%$TESTGRIDSTORAGE%g +s%@SSL@%$SSL%g +s%@SRB@%$SRB%g +s%@TESTSRB@%$TESTSRB%g s%@PDB2HDF@%$PDB2HDF%g s%@PTHREAD@%$PTHREAD%g s%@DEBUG_PKG@%$DEBUG_PKG%g diff --git a/configure.in b/configure.in index bc03a8c..5369982 100644 --- a/configure.in +++ b/configure.in @@ -648,69 +648,92 @@ case "$withval" in esac dnl ---------------------------------------------------------------------- -dnl Is the GNU zlib present? It has a header file `zlib.h' and a library +dnl Is the GNU zlib present? It has a header file `zlib.h' and a library dnl `-lz' and their locations might be specified with the `--with-zlib' -dnl command-line switch. The value is an include path and/or a library path. +dnl command-line switch. The value is an include path and/or a library path. dnl If the library path is specified then it must be preceded by a comma. dnl +AC_ARG_WITH(zlib, + [ --with-zlib=INC,LIB Use the GNU zlib compression],, + withval=yes) -AC_ARG_WITH(zlib,[ --with-zlib=INC,LIB Use the GNU zlib compression], - ,withval=yes) case $withval in - yes) - AC_CHECK_HEADERS(zlib.h) - AC_CHECK_LIB(z, compress) - ;; - no) - AC_MSG_CHECKING(for GNU zlib) - AC_MSG_RESULT(suppressed) - ;; - *) - zlib_inc="`echo $withval |cut -f1 -d,`" - if test -n "$zlib_inc"; then - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$zlib_inc" - AC_CHECK_HEADERS(zlib.h,,CPPFLAGS="$saved_CPPFLAGS") - else - AC_CHECK_HEADERS(zlib.h) - fi - - zlib_lib="`echo $withval |cut -f2 -d, -s`" - if test -n "$zlib_lib"; then - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$zlib_lib" - AC_CHECK_LIB(z, compress,,LDFLAGS="$saved_LDFLAGS") - else - AC_CHECK_LIB(z, compress) - fi - ;; + yes) + AC_CHECK_HEADERS(zlib.h) + AC_CHECK_LIB(z, compress) + ;; + no) + AC_MSG_CHECKING(for GNU zlib) + AC_MSG_RESULT(suppressed) + ;; + *) + zlib_inc="`echo $withval |cut -f1 -d,`" + if test -n "$zlib_inc"; then + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I$zlib_inc" + AC_CHECK_HEADERS(zlib.h,,CPPFLAGS="$saved_CPPFLAGS") + else + AC_CHECK_HEADERS(zlib.h) + fi + + zlib_lib="`echo $withval |cut -f2 -d, -s`" + + if test -n "$zlib_lib"; then + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$zlib_lib" + AC_CHECK_LIB(z, compress,,LDFLAGS="$saved_LDFLAGS") + else + AC_CHECK_LIB(z, compress) + fi + ;; esac dnl ---------------------------------------------------------------------- -dnl Is SSL library present? It is needed by GLOBUS-GASS and Grid Storage -dnl 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) - -dnl ---------------------------------------------------------------------- -dnl Is GLOBUS-GASS(1.1.0 or 1.1.1) Library present? It is also needed by +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 Library [default=no]], - ,withval=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) + 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_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) + AC_MSG_RESULT(suppressed) + unset GASS TESTGASS + ;; + *) + gass_inc="`echo $withval |cut -f1 -d,`" + + if test -n "$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 -n "$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_gass_cache,main,,unset GASS TESTGASS) AC_CHECK_LIB(globus_gaa,main,,unset GASS TESTGASS) @@ -720,103 +743,22 @@ case "$withval" in 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) - AC_MSG_RESULT(suppressed) - unset GASS TESTGASS - ;; - *) - gass_inc="`echo $withval |cut -f1 -d,`" - if test -n "$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 -n "$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_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_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 - ;; + else + 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 if test -n "$GASS"; then - AC_DEFINE(HAVE_GASS) -fi - -dnl ---------------------------------------------------------------------- -dnl Are SRB Client and other system libraries(socket, elf) present? -dnl -AC_SUBST(SRB) SRB=yes -AC_SUBST(TESTSRB) TESTSRB='$(srcdir)/testsrb' -AC_ARG_WITH(srb,[ --with-srb=INC,LIB Use the SRB Library [default=no]], - ,withval=no) - -case "$withval" in - yes) - AC_CHECK_HEADERS(srbClient.h,,unset SRB TESTSRB) - AC_CHECK_LIB(elf,main,,unset SRB TESTSRB) - AC_CHECK_LIB(socket,main,,unset SRB TESTSRB) - AC_CHECK_LIB(SrbClient,clConnect,,unset SRB TESTSRB) - ;; - no) - AC_MSG_CHECKING(for SRB) - AC_MSG_RESULT(suppressed) - unset SRB TESTSRB - ;; - *) - srb_inc="`echo $withval |cut -f1 -d,`" - if test -n "$srb_inc"; then - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$srb_inc" - AC_CHECK_HEADERS(srbClient.h,, - CPPFLAGS="$saved_CPPFLAGS" - unset SRB TESTSRB) - else - AC_CHECK_HEADERS(srbClient.h) - fi - - srb_lib="`echo $withval |cut -f2 -d, -s`" - if test -n "$srb_lib"; then - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$srb_lib" - AC_CHECK_LIB(elf,main,,unset SRB TESTSRB) - AC_CHECK_LIB(socket,main,,unset SRB TESTSRB) - AC_CHECK_LIB(SrbClient,clConnect,,unset SRB TESTSRB) - else - AC_CHECK_LIB(elf,main,,unset SRB TESTSRB) - AC_CHECK_LIB(socket,main,,unset SRB TESTSRB) - AC_CHECK_LIB(SrbClient,clConnect,,unset SRB TESTSRB) - fi - ;; -esac -if test -n "$SRB"; then - AC_DEFINE(HAVE_SRB) + AC_DEFINE(HAVE_GASS) fi dnl ---------------------------------------------------------------------- @@ -826,52 +768,121 @@ dnl AC_SUBST(GRIDSTORAGE) GRIDSTORAGE=yes AC_SUBST(TESTGRIDSTORAGE) TESTGRIDSTORAGE='$(srcdir)/testgridstorage' AC_ARG_WITH(gridstorage, - [ --with-gridstorage=INC,LIB Use the Globus Grid Storage driver [default=no]], - ,withval=no) + [ --with-gridstorage=INC,LIB Use the Globus Grid Storage driver [default=no]],, + withval=no) case "$withval" in - yes) - AC_CHECK_HEADERS(grid_storage_file.h,,unset GRIDSTORAGE TESTGRIDSTORAGE) - AC_CHECK_LIB(grid_storage_client,main,,unset GRIDSTORAGE TESTGRIDSTORAGE) + yes) + AC_CHECK_HEADERS(grid_storage_file.h,,unset GRIDSTORAGE TESTGRIDSTORAGE) + AC_CHECK_LIB(grid_storage_client,main,,unset GRIDSTORAGE TESTGRIDSTORAGE) + AC_CHECK_LIB(grid_storage_file,grid_storage_open,, + unset GRIDSTORAGE TESTGRIDSTORAGE) + ;; + no) + AC_MSG_CHECKING(for GRIDSTORAGE) + AC_MSG_RESULT(suppressed) + unset GRIDSTORAGE TESTGRIDSTORAGE + ;; + *) + gridstorage_inc="`echo $withval |cut -f1 -d,`" + + if test -n "$gridstorage_inc"; then + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I$gridstorage_inc" + AC_CHECK_HEADERS(grid_storage_file.h,, + CPPFLAGS="$saved_CPPFLAGS" + unset GRIDSTORAGE TESTGRIDSTORAGE) + else + AC_CHECK_HEADERS(grid_storage_file.h) + fi + + gridstorage_lib="`echo $withval |cut -f2 -d, -s`" + + if test -n "$gridstorage_lib"; then + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$gridstorage_lib" + AC_CHECK_LIB(grid_storage_client,main,, + unset GRIDSTORAGE TESTGRIDSTORAGE) AC_CHECK_LIB(grid_storage_file,grid_storage_open,, unset GRIDSTORAGE TESTGRIDSTORAGE) - ;; - no) - AC_MSG_CHECKING(for GRIDSTORAGE) - AC_MSG_RESULT(suppressed) - unset GRIDSTORAGE TESTGRIDSTORAGE - ;; - *) - gridstorage_inc="`echo $withval |cut -f1 -d,`" - if test -n "$gridstorage_inc"; then - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$gridstorage_inc" - AC_CHECK_HEADERS(grid_storage_file.h,, - CPPFLAGS="$saved_CPPFLAGS" - unset GRIDSTORAGE TESTGRIDSTORAGE) - else - AC_CHECK_HEADERS(grid_storage_file.h) - fi - - gridstorage_lib="`echo $withval |cut -f2 -d, -s`" - if test -n "$gridstorage_lib"; then - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$gridstorage_lib" - AC_CHECK_LIB(grid_storage_client,main,, - unset GRIDSTORAGE TESTGRIDSTORAGE) - AC_CHECK_LIB(grid_storage_file,grid_storage_open,, - unset GRIDSTORAGE TESTGRIDSTORAGE) - else - AC_CHECK_LIB(grid_storage_client,main,, - unset GRIDSTORAGE TESTGRIDSTORAGE) - AC_CHECK_LIB(grid_storage_file,grid_storage_open,, - unset GRIDSTORAGE TESTGRIDSTORAGE) - fi - ;; + else + AC_CHECK_LIB(grid_storage_client,main,, + unset GRIDSTORAGE TESTGRIDSTORAGE) + AC_CHECK_LIB(grid_storage_file,grid_storage_open,, + unset GRIDSTORAGE TESTGRIDSTORAGE) + fi + ;; esac if test -n "$GRIDSTORAGE"; then - AC_DEFINE(HAVE_GRIDSTORAGE) + 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 +AC_SUBST(SRB) SRB=yes +AC_SUBST(TESTSRB) TESTSRB='$(srcdir)/testsrb' +AC_ARG_WITH(srb,[ --with-srb=INC,LIB Use the SRB Library [default=no]],, + withval=no) + +case "$withval" in + yes) + AC_CHECK_HEADERS(srbClient.h,,unset SRB TESTSRB) + AC_CHECK_LIB(elf,main,,unset SRB TESTSRB) + AC_CHECK_LIB(socket,main,,unset SRB TESTSRB) + AC_CHECK_LIB(SrbClient,clConnect,,unset SRB TESTSRB) + ;; + no) + AC_MSG_CHECKING(for SRB) + AC_MSG_RESULT(suppressed) + unset SRB TESTSRB + ;; + *) + srb_inc="`echo $withval |cut -f1 -d,`" + if test -n "$srb_inc"; then + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I$srb_inc" + AC_CHECK_HEADERS(srbClient.h,, + CPPFLAGS="$saved_CPPFLAGS" + unset SRB TESTSRB) + else + AC_CHECK_HEADERS(srbClient.h) + fi + + srb_lib="`echo $withval |cut -f2 -d, -s`" + + if test -n "$srb_lib"; then + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$srb_lib" + AC_CHECK_LIB(elf,main,,unset SRB TESTSRB) + AC_CHECK_LIB(socket,main,,unset SRB TESTSRB) + AC_CHECK_LIB(SrbClient,clConnect,,unset SRB TESTSRB) + else + AC_CHECK_LIB(elf,main,,unset SRB TESTSRB) + AC_CHECK_LIB(socket,main,,unset SRB TESTSRB) + AC_CHECK_LIB(SrbClient,clConnect,,unset SRB TESTSRB) + fi + ;; +esac + +if test -n "$SRB"; then + AC_DEFINE(HAVE_SRB) fi dnl ---------------------------------------------------------------------- -- cgit v0.12