From 30e93d5e5dd14e5d804edb93076a175179595784 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 4 Aug 2005 16:17:30 +0000 Subject: [PATCH] use libcrypto svn path=/trunk/boinc/; revision=7186 --- Makefile.am | 2 +- Makefile.incl | 7 +------ checkin_notes | 9 +++++++++ lib/hostinfo.h | 1 + 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3da120d635..093720fd33 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,7 +22,7 @@ endif # ORDER MATTERS below. One must build dependencies FIRST, then things # 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 # dist-hook below gets rid of CVS directories. diff --git a/Makefile.incl b/Makefile.incl index e74eab65a6..511badd3b7 100644 --- a/Makefile.incl +++ b/Makefile.incl @@ -8,7 +8,7 @@ MYSQL_CFLAGS = @MYSQL_CFLAGS@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ -RSA_LIBS = -L$(top_builddir)/RSAEuro/source -lrsaeuro +RSA_LIBS = -lcrypto SCHED_LIB = -L$(top_builddir)/sched -lsched BOINC_LIB = -L$(top_builddir)/lib -lboinc @@ -16,7 +16,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/api \ -I$(top_srcdir)/db \ - -I$(top_srcdir)/RSAEuro/source \ -I$(top_srcdir)/client \ -I$(top_srcdir)/tools \ -I$(top_srcdir)/sched \ @@ -31,10 +30,6 @@ AM_LDFLAGS = # dependencies to make sure libs gets compiled before # 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): cd $(top_builddir)/sched; ${MAKE} libsched.a diff --git a/checkin_notes b/checkin_notes index 468471b0da..c567e0aed4 100755 --- a/checkin_notes +++ b/checkin_notes @@ -9942,3 +9942,12 @@ Bruce 4 August 2005 file_deleter.C 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 diff --git a/lib/hostinfo.h b/lib/hostinfo.h index 93c2c8c1b1..3eddcf8bd2 100644 --- a/lib/hostinfo.h +++ b/lib/hostinfo.h @@ -60,6 +60,7 @@ public: int write(MIOFILE&); int parse_cpu_benchmarks(FILE*); int write_cpu_benchmarks(FILE*); + void print(); bool host_is_running_on_batteries(); bool users_idle(bool check_all_logins, double idle_time_to_run);