The system was upgraded and everything is back online. If you experience any issues, please send an email to atlas_admin@aei.mpg.de - thanks a lot for your patience!

Commit 041b6f24 authored by David Anderson's avatar David Anderson

*** empty log message ***

svn path=/trunk/boinc/; revision=7492
parent dbcf18b6
......@@ -309,7 +309,7 @@ unsigned char* getData (FILE *s, int sz, int iBits){
}
unsigned * read_tga_texture(char *name, int *width, int *height, int *components) {
unsigned * read_tga_texture(char *name, int *width, int *height, int*) {
unsigned char type[4];
unsigned char info[7];
unsigned *base;
......
......@@ -10964,3 +10964,36 @@ Rom 25 Aug 2005
MainFrame.cpp, .h
ViewProjects.cpp
WizAttachProject.cpp
David 25 Aug 2005
- Unix build fixes from Reinhard Prix.
- remove #ifdefs on _USE_CURL. Pre-curl HTTP code is no longer supported.
- added "donated" field to user table.
NOTE: this update requires a database change. See html/ops/db_update.php
configure.ac
api/
texture.C
client/
Makefile.am
client_state.C,h
file_xfer.h
http_curl.C,h
main.C
net_stats.h
net_xfer_curl.C,h
scheduler_op.h
db/
boinc_db.C,h
schema.sql
html/
inc/
util.inc
ops/
db_update.php
m4/
libcurl.m4
sah_check_lib.m4
sched/
file_deleter.C
......@@ -61,10 +61,9 @@ boinc_client_SOURCES = \
whetstone.C
boinc_client_DEPENDENCIES = $(LIBRSA)
boinc_client_CPPFLAGS = -D_USE_CURL -I $(srcdir)/win $(AM_CPPFLAGS) -O3
boinc_client_CPPFLAGS = -I $(srcdir)/win $(AM_CPPFLAGS) -O3
boinc_client_LDFLAGS = -static-libgcc
boinc_client_LDADD = -L/usr/local/ssl/lib -lssl -lcurl -L../lib -lboinc $(RSA_LIBS) $(PTHREAD_LIBS)
#boinc_client_LDFLAGS = $(STATIC_FLAGS)
boinc_client_LDADD = -L../lib -lboinc $(PTHREAD_LIBS)
# the following don't do anything
cpu_benchmark_SOURCES = whetstone.C dhrystone.C
......
......@@ -56,11 +56,7 @@
#include "hostinfo.h"
#include "hostinfo_network.h"
#include "network.h"
#ifdef _USE_CURL
#include "http_curl.h"
#else
#include "http.h"
#endif
#include "log_flags.h"
#include "client_msgs.h"
#include "client_state.h"
......@@ -235,9 +231,7 @@ int CLIENT_STATE::init() {
);
#endif
#ifdef _USE_CURL
msg_printf(NULL, MSG_INFO, curl_version());
#endif
if (executing_as_daemon) {
msg_printf(NULL, MSG_INFO, "Executing as a daemon");
......
......@@ -41,14 +41,8 @@
#include "scheduler_op.h"
#include "ss_logic.h"
#include "time_stats.h"
#ifdef _USE_CURL
#include "http_curl.h"
#include "net_xfer_curl.h"
#else
#include "http.h"
#include "net_xfer.h"
#endif
#define USER_RUN_REQUEST_ALWAYS 1
#define USER_RUN_REQUEST_AUTO 2
......
......@@ -30,11 +30,7 @@
// - upload authentication
#include "client_types.h"
#ifdef _USE_CURL
#include "http_curl.h"
#else
#include "http.h"
#endif
class FILE_XFER : public HTTP_OP {
public:
......
......@@ -26,11 +26,7 @@
using std::string;
#ifdef _USE_CURL
#include "http_curl.h"
#else
#include "http.h"
#endif
// base class for various types of ops
//
......
This diff is collapsed.
......@@ -24,12 +24,6 @@
// CMC Note: This was redone to use libcurl ref: http://curl.haxx.se/libcurl
// to allow ease of use for SSL/HTTPS etc
// -D_USE_CURL in your C flags will build a "curl" BOINC client
// note the ifdef _USE_CURL in the *_curl.C/.h files to bypass
// this code (similarly the ifndef _USE_CURL in http/net_xfer/proxy.C/.h)
#ifdef _USE_CURL // only adds this file if user wants to link against libcurl
#ifndef _HTTP_
#define _HTTP_
......@@ -151,5 +145,3 @@ public:
extern void parse_url(const char* url, char* host, int &port, char* file);
#endif //__HTTP_H
#endif // _USE_CURL
......@@ -58,10 +58,8 @@ typedef void (CALLBACK* IdleTrackerTerm)();
#include "client_msgs.h"
#include "main.h"
#ifdef _USE_CURL // CMC do the curl initialization here in main
extern int curl_init(void);
extern int curl_cleanup(void);
#endif
// Display a message to the user.
// Depending on the priority, the message may be more or less obtrusive
......@@ -330,9 +328,7 @@ int main(int argc, char** argv) {
init_core_client(argc, argv);
#ifdef _USE_CURL
curl_init();
#endif
#ifdef _WIN32
// Initialize WinSock
......@@ -428,9 +424,7 @@ int main(int argc, char** argv) {
}
#endif
#ifdef _USE_CURL
curl_cleanup();
#endif
return retval;
}
......
......@@ -28,11 +28,7 @@
#include <cstdio>
#endif
#ifdef _USE_CURL
#include "net_xfer_curl.h"
#else
#include "net_xfer.h"
#endif
#include "miofile.h"
// there's one of these each for upload and download
......
......@@ -17,7 +17,6 @@
// or write to the Free Software Foundation, Inc.,
// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#ifdef _USE_CURL
#include "cpp.h"
......@@ -436,5 +435,3 @@ void NET_XFER_SET::check_active(bool& up, bool& down) {
}
const char *BOINC_RCSID_e0a7088e04 = "$Id$";
#endif //_USE_CURL
......@@ -17,8 +17,6 @@
// or write to the Free Software Foundation, Inc.,
// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#ifdef _USE_CURL
#ifndef _NET_XFER_
#define _NET_XFER_
......@@ -165,5 +163,3 @@ public:
};
#endif // _H
#endif // _USE_CURL
......@@ -23,11 +23,7 @@
#include <vector>
#include "client_types.h"
#ifdef _USE_CURL
#include "http_curl.h"
#else
#include "http.h"
#endif
#include "prefs.h"
// SCHEDULER_OP encapsulates the mechanism for
......
......@@ -30,7 +30,6 @@ boinc_gui_SOURCES = \
DlgAccountManagerSignup.cpp \
DlgAccountManagerStatus.cpp \
DlgDialupCredentials.cpp \
DlgAttachProject.cpp \
DlgOptions.cpp \
DlgSelectComputer.cpp \
LogBOINC.cpp \
......
......@@ -252,8 +252,42 @@ esac
dnl m4/boinc_getsockopt.m4
BOINC_GETSOCKOPT_TYPE
dnl m4/check_ssl.m4
CHECK_SSL
dnl ---------- SSL (m4/check_ssl.m4)
##CHECK_SSL
dnl ---------- libcurl (m4/libcurl.m4) ------------------------------
if test "${enable_client}" = yes; then
LIBCURL_CHECK_CONFIG([yes], [7.13.2], [haveCurl=yes], [haveCurl=no])
if test "${haveCurl}" != yes; then
AC_MSG_ERROR([
================================================================================
ERROR: could not find (recent enough) development-libs for libcurl.
This library is required to build the boinc-client.
(If you don't want to build the client, use --disable-client with configure.
If libcurl-dev is installed on your system, make sure that the script
'curl-config' is found in your PATH, and that
'curl-config --version' gives something recent enough (see above).
You can download libcurl from: http://curl.haxx.se/
================================================================================
])
else
if test "${enable_debug}" = yes; then
echo "LIBCURL = ${LIBCURL}"
echo "LIBCURL_CPPFLAGS = ${LIBCURL_CPPFLAGS}"
fi
## add libcurl et al. to the list of statically linked libs
STATIC_LIB_LIST="${STATIC_LIB_LIST} curl idn crypto ssl"
CPPFLAGS="${CPPFLAGS} ${LIBCURL_CPPFLAGS}"
fi
fi
dnl save the libs
SAVELIBS_AAF="${LIBS}"
......@@ -269,10 +303,14 @@ SAH_CHECK_LIB([socket], [bind],
[BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"])
SAH_CHECK_LIB([z], [gzopen],
[BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"])
SAH_CHECK_LIB([crypto], [RSA_new],
[BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} -L${SSLDIR}/lib ${sah_lib_last}"])
SAH_CHECK_LIB([ssl], [main],
[BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} -L${SSLDIR}/lib ${sah_lib_last}"])
dnl the following are only checked for libcurl: don't save anything
SAH_CHECK_LIB([crypto], [RSA_new], [])
SAH_CHECK_LIB([ssl], [SSL_accept],[])
SAH_CHECK_LIB([idn], [idn_free],[])
dnl if curl is ok, we add the full LIBCURL to the boinc-libs
SAH_CHECK_LIB([curl], [curl_easy_init],
[BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${LIBCURL}"])
LIBS=${SAVELIBS_AAF}
dnl check for pthread
......@@ -404,7 +442,6 @@ if test -e "/proc/meminfo"; then
AC_DEFINE(HAVE__PROC_MEMINFO, 1, [Define to 1 if /proc/meminfo exists])
fi
dnl ---------- wxWidgets --------------------------------------------------
AM_OPTIONS_WXCONFIG
......@@ -472,16 +509,20 @@ if ( test "${disable_static_client}" != yes ) && ( test "${enable_client}" = yes
echo "NOTE: Building portable client binaries"
echo "----------"
fi
SAH_CHECK_LIB([stdc++],[sscanf],[
AC_DEFINE([HAVE_LIBSTDC__],[1],[Define to 1 if you have the stdc++ library])
SAH_CHECK_LIB([c],[atexit], [
AC_DEFINE([HAVE_LIBC],[1],[Define to 1 if you have the c library])
CLIENTLIBS="${CLIENTLIBS} ${sah_lib_last}"])
echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
SAH_CHECK_LIB([gcc],[sscanf], [
AC_DEFINE([HAVE_LIBGCC],[1],[Define to 1 if you have the gcc library])
CLIENTLIBS="${CLIENTLIBS} ${sah_lib_last}"])
echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
SAH_CHECK_LIB([gcc_eh],[_Unwind_Resume],[
AC_DEFINE([HAVE_LIBGCC_EH],[1],[Define to 1 if you have the gcc_eh library])
CLIENTLIBS="${CLIENTLIBS} ${sah_lib_last}"])
echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
SAH_CHECK_LIB([gcc],[sscanf], [
AC_DEFINE([HAVE_LIBGCC],[1],[Define to 1 if you have the gcc library])
SAH_CHECK_LIB([stdc++],[sscanf],[
AC_DEFINE([HAVE_LIBSTDC__],[1],[Define to 1 if you have the stdc++ library])
CLIENTLIBS="${CLIENTLIBS} ${sah_lib_last}"])
echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
SAH_CHECK_LIB([m],[sin], [
......@@ -492,10 +533,6 @@ SAH_CHECK_LIB([pthread],[pthread_join],[
AC_DEFINE([HAVE_LIBPTHREAD],[1],[Define to 1 if you have the pthread library])
CLIENTLIBS="${CLIENTLIBS} ${sah_lib_last}"])
echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
SAH_CHECK_LIB([c],[atexit], [
AC_DEFINE([HAVE_LIBC],[1],[Define to 1 if you have the c library])
CLIENTLIBS="${CLIENTLIBS} ${sah_lib_last}"])
echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
SAH_CHECK_LDFLAG([-nodefaultlibs],[CLIENTLIBS="-nodefaultlibs ${CLIENTLIBS}"])
echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
......
......@@ -189,7 +189,8 @@ void DB_USER::db_print(char* buf){
"posts=%d, "
"seti_id=%d, seti_nresults=%d, seti_last_result_time=%d, "
"seti_total_cpu=%.15e, signature='%s', has_profile=%d, "
"cross_project_id='%s', passwd_hash='%s', email_validated=%d",
"cross_project_id='%s', passwd_hash='%s', "
"email_validated=%d, donated=%d",
create_time, email_addr, name,
authenticator,
country, postal_code,
......@@ -199,7 +200,8 @@ void DB_USER::db_print(char* buf){
posts,
seti_id, seti_nresults, seti_last_result_time,
seti_total_cpu, signature, has_profile,
cross_project_id, passwd_hash, email_validated
cross_project_id, passwd_hash,
email_validated, donated
);
UNESCAPE(email_addr);
UNESCAPE(name);
......@@ -241,6 +243,7 @@ void DB_USER::db_parse(MYSQL_ROW &r) {
strcpy2(cross_project_id, r[i++]);
strcpy2(passwd_hash, r[i++]);
email_validated = atoi(r[i++]);
donated = atoi(r[i++]);
}
void DB_TEAM::db_print(char* buf){
......
......@@ -151,6 +151,7 @@ struct USER {
char cross_project_id[256];
char passwd_hash[256];
bool email_validated;
int donated;
void clear();
};
......
......@@ -100,6 +100,7 @@ create table user (
cross_project_id varchar(254) not null,
passwd_hash varchar(254) not null,
email_validated smallint not null,
donated smallint not null,
primary key (id)
) type=InnoDB;
......
......@@ -67,8 +67,19 @@ You'll need to install the following software before building BOINC:
<td><br></td>
<td><br></td>
</tr>
<tr>
<td><a href=http://www.openssl.org/>OpenSSL</a> version 0.9.8 or higher
(included with the BOINC source distribution for Windows)
</td>
<td>X</td>
<td>X</td>
<td><br></td>
<td><br></td>
<td><br></td>
</tr>
<tr>
<td><a href=http://curl.haxx.se/>libcurl</a> version 7.14.0 or higher
(included with the BOINC source distribution for Windows)
</td>
<td><br></td>
<td>X</td>
......@@ -77,7 +88,7 @@ You'll need to install the following software before building BOINC:
<td><br></td>
</tr>
<tr>
<td><a href=http://www.wxwidgets.org/>WxWidgets</a> 2.6
<td><a href=http://www.wxwidgets.org/>WxWidgets</a> 2.6.1
</td>
<td><br></td>
<td><br></td>
......
......@@ -263,7 +263,7 @@ function print_login_form_aux($next_url, $user) {
start_table();
row1("Log in with email/password");
row2("Email address:", "<input name=email_addr size=40>");
row2("Password:", "<input name=passwd size=40>");
row2("Password:", "<input type=password name=passwd size=40>");
row1("Log in with account key");
row2("Your account key:
<br><font size=-2>
......
......@@ -282,6 +282,10 @@ function update_8_05_2005() {
do_query("update user set email_validated=1");
}
function update_8_25_2005() {
do_query("alter table user add donated smallint not null");
}
//update_10_25_2004();
?>
......@@ -21,6 +21,8 @@
#define _BOINC_NETWORK_H_
#include <string.h>
#include <unistd.h>
#include "config.h"
struct FDSET_GROUP {
fd_set read_fds;
......
# LIBCURL_CHECK_CONFIG ([DEFAULT-ACTION], [MINIMUM-VERSION],
# [ACTION-IF-YES], [ACTION-IF-NO])
# ----------------------------------------------------------
# David Shaw <dshaw@jabberwocky.com> Jun-21-2005
#
# Checks for libcurl. DEFAULT-ACTION is the string yes or no to
# specify whether to default to --with-libcurl or --without-libcurl.
# If not supplied, DEFAULT-ACTION is yes. MINIMUM-VERSION is the
# minimum version of libcurl to accept. Pass the version as a regular
# version number like 7.10.1. If not supplied, any version is
# accepted. ACTION-IF-YES is a list of shell commands to run if
# libcurl was successfully found and passed the various tests.
# ACTION-IF-NO is a list of shell commands that are run otherwise.
# Note that using --without-libcurl does run ACTION-IF-NO.
#
# This macro defines HAVE_LIBCURL if a working libcurl setup is found,
# and sets @LIBCURL@ and @LIBCURL_CPPFLAGS@ to the necessary values.
# Other useful defines are LIBCURL_FEATURE_xxx where xxx are the
# various features supported by libcurl, and LIBCURL_PROTOCOL_yyy
# where yyy are the various protocols supported by libcurl. Both xxx
# and yyy are capitalized. See the list of AH_TEMPLATEs at the top of
# the macro for the complete list of possible defines. Shell
# variables $libcurl_feature_xxx and $libcurl_protocol_yyy are also
# defined to 'yes' for those features and protocols that were found.
# Note that xxx and yyy keep the same capitalization as in the
# curl-config list (e.g. it's "HTTP" and not "http").
#
# Users may override the detected values by doing something like:
# LIBCURL="-lcurl" LIBCURL_CPPFLAGS="-I/usr/myinclude" ./configure
#
# For the sake of sanity, this macro assumes that any libcurl that is
# found is after version 7.7.2, the first version that included the
# curl-config script. Note that it is very important for people
# packaging binary versions of libcurl to include this script!
# Without curl-config, we can only guess what protocols are available.
AC_DEFUN([LIBCURL_CHECK_CONFIG],
[
AH_TEMPLATE([LIBCURL_FEATURE_SSL],[Defined if libcurl supports SSL])
AH_TEMPLATE([LIBCURL_FEATURE_KRB4],[Defined if libcurl supports KRB4])
AH_TEMPLATE([LIBCURL_FEATURE_IPV6],[Defined if libcurl supports IPv6])
AH_TEMPLATE([LIBCURL_FEATURE_LIBZ],[Defined if libcurl supports libz])
AH_TEMPLATE([LIBCURL_FEATURE_ASYNCHDNS],[Defined if libcurl supports AsynchDNS])
AH_TEMPLATE([LIBCURL_PROTOCOL_HTTP],[Defined if libcurl supports HTTP])
AH_TEMPLATE([LIBCURL_PROTOCOL_HTTPS],[Defined if libcurl supports HTTPS])
AH_TEMPLATE([LIBCURL_PROTOCOL_FTP],[Defined if libcurl supports FTP])
AH_TEMPLATE([LIBCURL_PROTOCOL_FTPS],[Defined if libcurl supports FTPS])
AH_TEMPLATE([LIBCURL_PROTOCOL_GOPHER],[Defined if libcurl supports GOPHER])
AH_TEMPLATE([LIBCURL_PROTOCOL_FILE],[Defined if libcurl supports FILE])
AH_TEMPLATE([LIBCURL_PROTOCOL_TELNET],[Defined if libcurl supports TELNET])
AH_TEMPLATE([LIBCURL_PROTOCOL_LDAP],[Defined if libcurl supports LDAP])
AH_TEMPLATE([LIBCURL_PROTOCOL_DICT],[Defined if libcurl supports DICT])
AC_ARG_WITH(libcurl,
AC_HELP_STRING([--with-libcurl=DIR],[look for the curl library in DIR]),
[_libcurl_with=$withval],[_libcurl_with=ifelse([$1],,[yes],[$1])])
if test "$_libcurl_with" != "no" ; then
AC_PROG_AWK
_libcurl_version_parse="eval $AWK '{split(\$NF,A,\".\"); X=256*256*A[[1]]+256*A[[2]]+A[[3]]; print X;}'"
_libcurl_try_link=yes
if test -d "$_libcurl_with" ; then
CPPFLAGS="${CPPFLAGS} -I$withval/include"
LDFLAGS="${LDFLAGS} -L$withval/lib"
fi
AC_PATH_PROG([_libcurl_config],[curl-config])
if test x$_libcurl_config != "x" ; then
AC_CACHE_CHECK([for the version of libcurl],
[libcurl_cv_lib_curl_version],
[libcurl_cv_lib_curl_version=`$_libcurl_config --version | $AWK '{print $[]2}'`])
_libcurl_version=`echo $libcurl_cv_lib_curl_version | $_libcurl_version_parse`
_libcurl_wanted=`echo ifelse([$2],,[0],[$2]) | $_libcurl_version_parse`
if test $_libcurl_wanted -gt 0 ; then
AC_CACHE_CHECK([for libcurl >= version $2],
[libcurl_cv_lib_version_ok],
[
if test $_libcurl_version -ge $_libcurl_wanted ; then
libcurl_cv_lib_version_ok=yes
else
libcurl_cv_lib_version_ok=no
fi
])
fi
if test $_libcurl_wanted -eq 0 || test x$libcurl_cv_lib_version_ok = xyes ; then
if test x"$LIBCURL_CPPFLAGS" = "x" ; then
LIBCURL_CPPFLAGS=`$_libcurl_config --cflags`
fi
if test x"$LIBCURL" = "x" ; then
LIBCURL=`$_libcurl_config --libs`
# This is so silly, but Apple actually has a bug in their
# curl-config script. Fixed in Tiger, but there are still
# lots of Panther installs around.
case "${host}" in
powerpc-apple-darwin7*)
LIBCURL=`echo $LIBCURL | sed -e 's|-arch i386||g'`
;;
esac
fi
# All curl-config scripts support --feature
_libcurl_features=`$_libcurl_config --feature`
# Is it modern enough to have --protocols? (7.12.4)
if test $_libcurl_version -ge 461828 ; then
_libcurl_protocols=`$_libcurl_config --protocols`
fi
else
_libcurl_try_link=no
fi
unset _libcurl_wanted
fi
if test $_libcurl_try_link = yes ; then
# we didn't find curl-config, so let's see if the user-supplied
# link line (or failing that, "-lcurl") is enough.
LIBCURL=${LIBCURL-"-lcurl"}
AC_CACHE_CHECK([whether libcurl is usable],
[libcurl_cv_lib_curl_usable],
[
_libcurl_save_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS"
_libcurl_save_libs=$LIBS
LIBS="$LIBS $LIBCURL"
AC_LINK_IFELSE(AC_LANG_PROGRAM([#include <curl/curl.h>],[
/* Try and use a few common options to force a failure if we are
missing symbols or can't link. */
int x;
curl_easy_setopt(NULL,CURLOPT_URL,NULL);
x=CURL_ERROR_SIZE;
x=CURLOPT_WRITEFUNCTION;
x=CURLOPT_FILE;
x=CURLOPT_ERRORBUFFER;
x=CURLOPT_STDERR;
x=CURLOPT_VERBOSE;
]),libcurl_cv_lib_curl_usable=yes,libcurl_cv_lib_curl_usable=no)
CPPFLAGS=$_libcurl_save_cppflags
LIBS=$_libcurl_save_libs
unset _libcurl_save_cppflags
unset _libcurl_save_libs
])
if test $libcurl_cv_lib_curl_usable = yes ; then
# Does curl_free() exist in this version of libcurl?
# If not, fake it with free()
_libcurl_save_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS"
_libcurl_save_libs=$LIBS
LIBS="$LIBS $LIBCURL"
AC_CHECK_FUNC(curl_free,,
AC_DEFINE(curl_free,free,
[Define curl_free() as free() if our version of curl lacks curl_free.]))
CPPFLAGS=$_libcurl_save_cppflags
LIBS=$_libcurl_save_libs
unset _libcurl_save_cppflags
unset _libcurl_save_libs
AC_DEFINE(HAVE_LIBCURL,1,
[Define to 1 if you have a functional curl library.])
AC_SUBST(LIBCURL_CPPFLAGS)
AC_SUBST(LIBCURL)
for _libcurl_feature in $_libcurl_features ; do
AC_DEFINE_UNQUOTED(AS_TR_CPP(libcurl_feature_$_libcurl_feature),[1])
eval AS_TR_SH(libcurl_feature_$_libcurl_feature)=yes
done
if test "x$_libcurl_protocols" = "x" ; then
# We don't have --protocols, so just assume that all
# protocols are available
_libcurl_protocols="HTTP FTP GOPHER FILE TELNET LDAP DICT"
if test x$libcurl_feature_SSL = xyes ; then
_libcurl_protocols="$_libcurl_protocols HTTPS"
# FTPS wasn't standards-compliant until version
# 7.11.0
if test $_libcurl_version -ge 461568; then
_libcurl_protocols="$_libcurl_protocols FTPS"
fi
fi
fi
for _libcurl_protocol in $_libcurl_protocols ; do
AC_DEFINE_UNQUOTED(AS_TR_CPP(libcurl_protocol_$_libcurl_protocol),[1])
eval AS_TR_SH(libcurl_protocol_$_libcurl_protocol)=yes
done
fi
fi
unset _libcurl_try_link
unset _libcurl_version_parse
unset _libcurl_config
unset _libcurl_feature
unset _libcurl_features
unset _libcurl_protocol
unset _libcurl_protocols
unset _libcurl_version
fi
if test x$_libcurl_with = xno || test x$libcurl_cv_lib_curl_usable != xyes ; then
# This is the IF-NO path
ifelse([$4],,:,[$4])
else
# This is the IF-YES path
ifelse([$3],,:,[$3])
fi
unset _libcurl_with
])dnl