From 483ceaca0bd03a0945a5bfec391b9d494eed4437 Mon Sep 17 00:00:00 2001 From: "Eric J. Korpela" Date: Fri, 29 Oct 2004 04:42:37 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=4456 --- Makefile.incl | 3 +++ aclocal.m4 | 4 ++-- api/Makefile.am | 2 +- apps/Makefile.am | 2 +- checkin_notes | 22 ++++++++++++++++++++++ client/Makefile.am | 2 +- clientgui/Makefile.am | 1 + lib/Makefile.am | 4 ++-- sched/Makefile.am | 2 +- sched/file_upload_handler.C | 2 +- tools/Makefile.am | 6 +++--- 11 files changed, 38 insertions(+), 12 deletions(-) diff --git a/Makefile.incl b/Makefile.incl index a3bde49b90..644d16f002 100644 --- a/Makefile.incl +++ b/Makefile.incl @@ -5,6 +5,8 @@ MYSQL_LIBS = @MYSQL_LIBS@ MYSQL_CFLAGS = @MYSQL_CFLAGS@ +PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ +PTHREAD_LIBS = @PTHREAD_LIBS@ RSA_LIBS = \ -L$(top_builddir)/RSAEuro/source \ @@ -19,6 +21,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/tools \ -I$(top_srcdir)/sched \ $(MYSQL_CFLAGS) \ + $(PTHREAD_CFLAGS) \ -include $(top_builddir)/config.h # this is useful as a dependency to make sure librsaeuro gets compiled before diff --git a/aclocal.m4 b/aclocal.m4 index 334d9b5272..161ea7bac7 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1106,8 +1106,8 @@ AC_DEFUN([SAH_HEADER_STDCXX],[ # # Revision Log: # $Log$ -# Revision 1.159 2004/10/26 21:50:36 boincadm -# version 4.53 +# Revision 1.160 2004/10/29 04:42:32 korpela +# *** empty log message *** # # Revision 1.1 2003/12/11 18:38:24 korpela # Added checked macro files into boinc diff --git a/api/Makefile.am b/api/Makefile.am index 2fab51577f..ccacf3a6f3 100644 --- a/api/Makefile.am +++ b/api/Makefile.am @@ -26,7 +26,7 @@ lib_LIBRARIES = libboinc_api.a libboinc_graphics_api.a libboinc_api_a_SOURCES = $(api_files) libboinc_graphics_api_a_SOURCES = $(graphics_api_files) -libboinc_graphics_api_a_CPPFLAGS = -I$(top_srcdir)/boincglut/include -I$(top_srcdir)/lib +libboinc_graphics_api_a_CPPFLAGS = -I$(top_srcdir)/boincglut/include -I$(top_srcdir)/lib ## install header-files with prefix-subdir BOINC/ to avoid name-conflicts includedir = ${prefix}/include/BOINC/ diff --git a/apps/Makefile.am b/apps/Makefile.am index c4a5d8d623..413fe0cdfd 100644 --- a/apps/Makefile.am +++ b/apps/Makefile.am @@ -8,7 +8,7 @@ bin_PROGRAMS = upper_case concat 1sec # when we are ready to build graphics apps on unix: # LDADD = -lm -lGL -lGLU -lpthread -L. -lapp -LDADD = -L../lib -L../api -lboinc -lboinc_api +LDADD = -L../lib -L../api -lboinc -lboinc_api $(PTHREAD_LIBS) # upper_case_x11_SOURCES = upper_case_x11.C ../api/x_opengl.C ../api/boinc_api.C ../api/graphics_api.C # upper_case_x11_CPPFLAGS = -DBOINC_APP_GRAPHICS diff --git a/checkin_notes b/checkin_notes index 5eb0efdb5e..05e20e56f6 100755 --- a/checkin_notes +++ b/checkin_notes @@ -18941,3 +18941,25 @@ David 28 Oct 2004 Makefile.old lib/ gui_rpc_client.C,h + +Eric 28 Oct 2004 + - added threading flags and libraries to compile lines. + - upload handler now checks for zero length + + Makefile.incl + aclocal.m4 + api/ + Makefile.am + apps/ + Makefile.am + client/ + Makefile.am + clientgui/ + Makefile.am + lib/ + Makefile.am + sched/ + Makefile.am + file_upload_handler.C + tools/ + Makefile.am diff --git a/client/Makefile.am b/client/Makefile.am index 362bff40cd..2b1781ffeb 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -67,7 +67,7 @@ boinc_client_SOURCES = \ boinc_client_DEPENDENCIES = $(LIBRSA) boinc_client_CPPFLAGS = -I $(srcdir)/win $(AM_CPPFLAGS) -O3 -boinc_client_LDADD = $(RSA_LIBS) +boinc_client_LDADD = $(RSA_LIBS) $(PTHREAD_LIBS) #boinc_client_LDFLAGS = $(STATIC_FLAGS) # the following don't do anything diff --git a/clientgui/Makefile.am b/clientgui/Makefile.am index 524b6e16e5..31c814ddde 100644 --- a/clientgui/Makefile.am +++ b/clientgui/Makefile.am @@ -35,6 +35,7 @@ boincgui_SOURCES = \ ../lib/util.C boincgui_CPPFLAGS = $(AM_CPPFLAGS) -O3 +boincgui_LDADD = $(PTHREAD_LIBS) all-local: client-bin client-bin: @CLIENT_BIN_FILENAME@ diff --git a/lib/Makefile.am b/lib/Makefile.am index eed051c804..3ae7cc1728 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -14,7 +14,7 @@ EXTRA_PROGRAMS = md5_test shmem_test msg_test ##LIBS = -lnsl -lsocket gui_test_SOURCES = gui_test.C gui_rpc_client.C gui_rpc_client.h -gui_test_LDADD = $(lib_LIBRARIES) +gui_test_LDADD = $(lib_LIBRARIES) $(PTHREAD_LIBS) lib_LIBRARIES = libboinc.a @@ -82,4 +82,4 @@ shmem_test_SOURCES = shmem_test.C shmem.C msg_test_SOURCES = msg_test.C msg_queue.C crypt_prog_SOURCES = crypt_prog.C crypt.C md5.c md5_file.C crypt_prog_DEPENDENCIES = $(LIBRSA) -crypt_prog_LDADD = $(RSA_LIBS) +crypt_prog_LDADD = $(RSA_LIBS) $(PTHREAD_LIBS) diff --git a/sched/Makefile.am b/sched/Makefile.am index 15376a5494..12cf81dc3b 100644 --- a/sched/Makefile.am +++ b/sched/Makefile.am @@ -31,7 +31,7 @@ EXTRA_DIST = start # scripts that 'make install' should put in bindir bin_SCRIPTS = start stop status -LDADD = -L. -lsched $(MYSQL_LIBS) +LDADD = -L. -lsched $(MYSQL_LIBS) $(PTHREAD_LIBS) LIB_SCHED = libsched.a diff --git a/sched/file_upload_handler.C b/sched/file_upload_handler.C index 68e68a621e..891390beab 100644 --- a/sched/file_upload_handler.C +++ b/sched/file_upload_handler.C @@ -255,7 +255,7 @@ int handle_file_upload(FILE* in, R_RSA_PUBLIC_KEY& key) { else if (parse_double(buf, "", offset)) continue; else if (parse_double(buf, "", nbytes)) continue; else if (match_tag(buf, "")) { - if (nbytes < 0) { + if (nbytes <= 0) { return return_error(ERR_PERMANENT, "nbytes missing or negative"); } diff --git a/tools/Makefile.am b/tools/Makefile.am index 72cc3badc8..61fc87a527 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,4 +1,4 @@ -## $Id$ + include $(top_srcdir)/Makefile.incl @@ -24,7 +24,7 @@ create_work_SOURCES = \ backend_lib.h create_work_DEPENDENCIES = $(LIBRSA) -create_work_LDADD = $(RSA_LIBS) $(MYSQL_LIBS) +create_work_LDADD = $(RSA_LIBS) $(MYSQL_LIBS) $(PTHREAD_LIBS) sign_executable_SOURCES = \ sign_executable.C \ @@ -33,7 +33,7 @@ sign_executable_SOURCES = \ ../lib/crypt.C sign_executable_DEPENDENCIES = $(LIBRSA) -sign_executable_LDADD = $(RSA_LIBS) $(MYSQL_LIBS) +sign_executable_LDADD = $(RSA_LIBS) $(MYSQL_LIBS) $(PTHREAD_LIBS) dir_hier_path_SOURCES = \ dir_hier_path.C \