use libcrypto

svn path=/trunk/boinc/; revision=7186
This commit is contained in:
David Anderson 2005-08-04 16:17:30 +00:00
parent aec16a6fe9
commit 30e93d5e5d
4 changed files with 12 additions and 7 deletions

View File

@ -22,7 +22,7 @@ endif
# ORDER MATTERS below. One must build dependencies FIRST, then things # ORDER MATTERS below. One must build dependencies FIRST, then things
# that depend on them later # that depend on them later
SUBDIRS = m4 RSAEuro $(API_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS) $(CLIENTGUI_SUBDIRS) SUBDIRS = m4 $(API_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS) $(CLIENTGUI_SUBDIRS)
# Putting a directory name recursively copies the entire contents - the # Putting a directory name recursively copies the entire contents - the
# dist-hook below gets rid of CVS directories. # dist-hook below gets rid of CVS directories.

View File

@ -8,7 +8,7 @@ MYSQL_CFLAGS = @MYSQL_CFLAGS@
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
PTHREAD_LIBS = @PTHREAD_LIBS@ PTHREAD_LIBS = @PTHREAD_LIBS@
RSA_LIBS = -L$(top_builddir)/RSAEuro/source -lrsaeuro RSA_LIBS = -lcrypto
SCHED_LIB = -L$(top_builddir)/sched -lsched SCHED_LIB = -L$(top_builddir)/sched -lsched
BOINC_LIB = -L$(top_builddir)/lib -lboinc BOINC_LIB = -L$(top_builddir)/lib -lboinc
@ -16,7 +16,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/lib \ -I$(top_srcdir)/lib \
-I$(top_srcdir)/api \ -I$(top_srcdir)/api \
-I$(top_srcdir)/db \ -I$(top_srcdir)/db \
-I$(top_srcdir)/RSAEuro/source \
-I$(top_srcdir)/client \ -I$(top_srcdir)/client \
-I$(top_srcdir)/tools \ -I$(top_srcdir)/tools \
-I$(top_srcdir)/sched \ -I$(top_srcdir)/sched \
@ -31,10 +30,6 @@ AM_LDFLAGS =
# dependencies to make sure libs gets compiled before # dependencies to make sure libs gets compiled before
# programs linking to them: # programs linking to them:
LIBRSA = $(top_builddir)/RSAEuro/source/librsaeuro.a
$(LIBRSA):
cd $(top_builddir)/RSAEuro/source; ${MAKE} librsaeuro.a
LIBSCHED = $(top_builddir)/libsched.a LIBSCHED = $(top_builddir)/libsched.a
$(LIBSCHED): $(LIBSCHED):
cd $(top_builddir)/sched; ${MAKE} libsched.a cd $(top_builddir)/sched; ${MAKE} libsched.a

View File

@ -9942,3 +9942,12 @@ Bruce 4 August 2005
file_deleter.C file_deleter.C
an output file to delete for a result whose outcome was not an output file to delete for a result whose outcome was not
David 4 Aug 2005
- Change Unix build to use libcrypto instead of RSAEuro
- compile fix
Makefile.am
Makefile.incl
lib/
hostinfo.h

View File

@ -60,6 +60,7 @@ public:
int write(MIOFILE&); int write(MIOFILE&);
int parse_cpu_benchmarks(FILE*); int parse_cpu_benchmarks(FILE*);
int write_cpu_benchmarks(FILE*); int write_cpu_benchmarks(FILE*);
void print();
bool host_is_running_on_batteries(); bool host_is_running_on_batteries();
bool users_idle(bool check_all_logins, double idle_time_to_run); bool users_idle(bool check_all_logins, double idle_time_to_run);