gcc 3.0 compilation fixes

svn path=/trunk/boinc/; revision=438
2002-09-26 23:12:13 +00:00 · 2002-09-26 23:12:13 +00:00 · ca634eaca8
parent 74463521b0
commit ca634eaca8
17 changed files with 1514 additions and 3195 deletions
--- a/api/Makefile.in
+++ b/api/Makefile.in
@ -13,10 +13,12 @@ CFLAGS = -g -Wall @DEFS@ \

 CC = @CC@ $(CFLAGS)

+CLIBS = @LIBS@
+
 PROGS = api_app api_test

 #all: $(PROGS)
-all: mfile.o boinc_api.o
+all: mfile.o boinc_api.o graphics_api.o

 APP_OBJS = \
    api_app.o \
@ -35,10 +37,10 @@ TEST_OBJS = \
 	$(CC) -c -o $*.o $<

 api_app: $(APP_OBJS)
-	$(CC) $(APP_OBJS) -o api_app
+	$(CC) $(APP_OBJS) $(CLIBS) -o api_app

 api_test: $(TEST_OBJS)
-	$(CC) $(TEST_OBJS) -o api_test
+	$(CC) $(TEST_OBJS) $(CLIBS) -o api_test

 install: all
 	-mkdir -p $(INSTALL_DIR)/api
--- a/apps/Makefile.in
+++ b/apps/Makefile.in
@ -27,13 +27,13 @@ APPS = upper_case concat 1sec
 all: $(APPS)

 upper_case: upper_case.o
-	$(CC) upper_case.o $(LIBS) -lm -o upper_case
+	$(CC) upper_case.o $(LIBS) $(CLIBS) -lm -o upper_case

 concat: concat.o
-	$(CC) concat.o $(LIBS) -lm -o concat
+	$(CC) concat.o $(LIBS) $(CLIBS) -lm -o concat

 1sec: 1sec.o
-	$(CC) 1sec.o $(LIBS) -lm -o 1sec
+	$(CC) 1sec.o $(LIBS) $(CLIBS) -lm -o 1sec

 install: all
 	-mkdir -p $(INSTALL_DIR)/apps
--- a/apps/concat.C
+++ b/apps/concat.C
@ -23,6 +23,7 @@

 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>

 #include "filesys.h"
--- a/apps/upper_case.C
+++ b/apps/upper_case.C
@ -30,6 +30,9 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <time.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>

 #ifdef BOINC_APP_GRAPHICS
 #ifdef __APPLE_CC__
--- a/client/configure
+++ b/client/configure
--- a/client/configure.in
+++ b/client/configure.in
@ -33,6 +33,7 @@ dnl Replace `main' with a function in -lgen:
 AC_CHECK_LIB(gen, strfind)
 AC_CHECK_LIB(gen, strfind, [ AC_DEFINE(HAVE_STRFIND) ] )
 AC_CHECK_LIB(stdc++, cerr)
+AC_CHECK_LIB(stdc++, main)

 dnl Checks for header files.
 AC_HEADER_DIRENT
--- a/client/test_file_xfer.C
+++ b/client/test_file_xfer.C
@ -19,6 +19,7 @@

 #include <stdio.h>
 #include <unistd.h>
+#include "windows_cpp.h"

 #include "http.h"
 #include "file_xfer.h"
--- a/163
+++ b/163
@ -1171,14 +1171,14 @@ else
  echo "$ac_t""no" 1>&6
 fi

-echo $ac_n "checking for main in -lstdc""... $ac_c" 1>&6
-echo "configure:1176: checking for main in -lstdc" >&5
-ac_lib_var=`echo stdc'_'main | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for main in -lstdc++""... $ac_c" 1>&6
+echo "configure:1176: checking for main in -lstdc++" >&5
+ac_lib_var=`echo stdc++'_'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="-lstdc  $LIBS"
+LIBS="-lstdc++  $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 1184 "configure"
 #include "confdefs.h"
@ -1199,6 +1199,49 @@ 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 stdc++ | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lstdc++ $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking for main in -lstdc""... $ac_c" 1>&6
+echo "configure:1219: checking for main in -lstdc" >&5
+ac_lib_var=`echo stdc'_'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="-lstdc  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 1227 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:1234: \"$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
+  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
@ -1215,7 +1258,7 @@ else
 fi

 echo $ac_n "checking for gzopen in -lz""... $ac_c" 1>&6
-echo "configure:1219: checking for gzopen in -lz" >&5
+echo "configure:1262: checking for gzopen in -lz" >&5
 ac_lib_var=`echo z'_'gzopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@ -1223,7 +1266,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lz  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1227 "configure"
+#line 1270 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@ -1234,7 +1277,7 @@ int main() {
 gzopen()
 ; return 0; }
 EOF
-if { (eval echo configure:1238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1281: \"$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
@ -1267,12 +1310,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:1271: checking for $ac_hdr that defines DIR" >&5
+echo "configure:1314: checking for $ac_hdr that defines DIR" >&5
 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 1276 "configure"
+#line 1319 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@ -1280,7 +1323,7 @@ int main() {
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:1284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@ -1305,7 +1348,7 @@ done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:1309: checking for opendir in -ldir" >&5
+echo "configure:1352: checking for opendir in -ldir" >&5
 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@ -1313,7 +1356,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1317 "configure"
+#line 1360 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@ -1324,7 +1367,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:1328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1371: \"$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
@ -1346,7 +1389,7 @@ fi

 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:1350: checking for opendir in -lx" >&5
+echo "configure:1393: checking for opendir in -lx" >&5
 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@ -1354,7 +1397,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1358 "configure"
+#line 1401 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@ -1365,7 +1408,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:1369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1412: \"$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
@ -1388,7 +1431,7 @@ fi
 fi

 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1392: checking how to run the C preprocessor" >&5
+echo "configure:1435: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
  CPP=
@ -1403,13 +1446,13 @@ else
  # On the NeXT, cc -E runs the code through the compiler's parser,
  # not just through cpp.
  cat > conftest.$ac_ext <<EOF
-#line 1407 "configure"
+#line 1450 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1413: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1456: \"$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
  :
@ -1420,13 +1463,13 @@ else
  rm -rf conftest*
  CPP="${CC-cc} -E -traditional-cpp"
  cat > conftest.$ac_ext <<EOF
-#line 1424 "configure"
+#line 1467 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1473: \"$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
  :
@ -1437,13 +1480,13 @@ else
  rm -rf conftest*
  CPP="${CC-cc} -nologo -E"
  cat > conftest.$ac_ext <<EOF
-#line 1441 "configure"
+#line 1484 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1447: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1490: \"$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
  :
@ -1468,12 +1511,12 @@ fi
 echo "$ac_t""$CPP" 1>&6

 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1472: checking for ANSI C header files" >&5
+echo "configure:1515: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 1477 "configure"
+#line 1520 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@ -1481,7 +1524,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1485: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1528: \"$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*
@ -1498,7 +1541,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1502 "configure"
+#line 1545 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@ -1516,7 +1559,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1520 "configure"
+#line 1563 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@ -1537,7 +1580,7 @@ if test "$cross_compiling" = yes; then
  :
 else
  cat > conftest.$ac_ext <<EOF
-#line 1541 "configure"
+#line 1584 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@ -1548,7 +1591,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }

 EOF
-if { (eval echo configure:1552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
  :
 else
@ -1572,12 +1615,12 @@ EOF
 fi

 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:1576: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:1619: checking for sys/wait.h that is POSIX.1 compatible" >&5
 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 1581 "configure"
+#line 1624 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@ -1593,7 +1636,7 @@ wait (&s);
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:1597: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1640: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_header_sys_wait_h=yes
 else
@ -1617,17 +1660,17 @@ for ac_hdr in fcntl.h malloc.h strings.h sys/time.h unistd.h sys/systeminfo.h sy
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1621: checking for $ac_hdr" >&5
+echo "configure:1664: 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
-#line 1626 "configure"
+#line 1669 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1631: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1674: \"$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*
@ -1657,17 +1700,17 @@ for ac_hdr in mysql/include/mysql_com.h mysql/mysql_com.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1661: checking for $ac_hdr" >&5
+echo "configure:1704: 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
-#line 1666 "configure"
+#line 1709 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1671: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1714: \"$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*
@ -1695,12 +1738,12 @@ done


 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1699: checking for working const" >&5
+echo "configure:1742: 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 <<EOF
-#line 1704 "configure"
+#line 1747 "configure"
 #include "confdefs.h"

 int main() {
@ -1749,7 +1792,7 @@ ccp = (char const *const *) p;

 ; return 0; }
 EOF
-if { (eval echo configure:1753: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1796: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_const=yes
 else
@ -1770,12 +1813,12 @@ EOF
 fi

 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:1774: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:1817: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 1779 "configure"
+#line 1822 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@ -1784,7 +1827,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:1788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1831: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_header_time=yes
 else
@ -1807,13 +1850,13 @@ fi

 if test $ac_cv_prog_gcc = yes; then
    echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:1811: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:1854: checking whether ${CC-cc} needs -traditional" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
    ac_pattern="Autoconf.*'x'"
  cat > conftest.$ac_ext <<EOF
-#line 1817 "configure"
+#line 1860 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@ -1831,7 +1874,7 @@ rm -f conftest*

  if test $ac_cv_prog_gcc_traditional = no; then
    cat > conftest.$ac_ext <<EOF
-#line 1835 "configure"
+#line 1878 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@ -1853,12 +1896,12 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6
 fi

 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:1857: checking for vprintf" >&5
+echo "configure:1900: checking for vprintf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 1862 "configure"
+#line 1905 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char vprintf(); below.  */
@ -1881,7 +1924,7 @@ vprintf();

 ; return 0; }
 EOF
-if { (eval echo configure:1885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_func_vprintf=yes"
 else
@ -1905,12 +1948,12 @@ fi

 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:1909: checking for _doprnt" >&5
+echo "configure:1952: checking for _doprnt" >&5
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 1914 "configure"
+#line 1957 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char _doprnt(); below.  */
@ -1933,7 +1976,7 @@ _doprnt();

 ; return 0; }
 EOF
-if { (eval echo configure:1937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_func__doprnt=yes"
 else
@ -1958,7 +2001,7 @@ fi
 fi

 echo $ac_n "checking for wait3 that fills in rusage""... $ac_c" 1>&6
-echo "configure:1962: checking for wait3 that fills in rusage" >&5
+echo "configure:2005: checking for wait3 that fills in rusage" >&5
 if eval "test \"`echo '$''{'ac_cv_func_wait3_rusage'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -1966,7 +2009,7 @@ else
  ac_cv_func_wait3_rusage=no
 else
  cat > conftest.$ac_ext <<EOF
-#line 1970 "configure"
+#line 2013 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@ -1997,7 +2040,7 @@ main() {
  }
 }
 EOF
-if { (eval echo configure:2001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
  ac_cv_func_wait3_rusage=yes
 else
@ -2022,12 +2065,12 @@ fi
 for ac_func in gethostname gettimeofday mkdir select socket strstr uname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2026: checking for $ac_func" >&5
+echo "configure:2069: 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 <<EOF
-#line 2031 "configure"
+#line 2074 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func(); below.  */
@ -2050,7 +2093,7 @@ $ac_func();

 ; return 0; }
 EOF
-if { (eval echo configure:2054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2097: \"$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
--- a/configure.in
+++ b/configure.in
@ -18,6 +18,8 @@ AC_CHECK_LIB(nsl, main)
 dnl Replace `main' with a function in -lsocket:
 AC_CHECK_LIB(socket, main)
 dnl Replace `main' with a function in -lstdc:
+AC_CHECK_LIB(stdc++, main)
+dnl Replace `main' with a function in -lstdc:
 AC_CHECK_LIB(stdc, main)
 dnl Replace `main' with a function in -lz:
 AC_CHECK_LIB(z, gzopen)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@ -11,6 +11,8 @@ CFLAGS = -g -Wall @DEFS@

 CC = @CC@ $(CFLAGS) -I ../RSAEuro/source

+CLIBS = @LIBS@
+
 PROGS = md5_test shmem_test synch_test crypt_prog

 OBJS = \
@ -44,16 +46,16 @@ libboinc.a: $(OBJS) $(MD5_OBJS)
 	ar cr libboinc.a $(OBJS) $(MD5_OBJS); ranlib libboinc.a

 md5_test: md5_test.o $(MD5_OBJS)
-	$(CC) md5_test.o $(MD5_OBJS) -o md5_test
+	$(CC) md5_test.o $(MD5_OBJS) $(CLIBS) -o md5_test

 shmem_test: shmem_test.o shmem.o
-	$(CC) shmem_test.o shmem.o -o shmem_test
+	$(CC) shmem_test.o shmem.o $(CLIBS) -o shmem_test

 synch_test: synch_test.o synch.o
-	$(CC) synch_test.o synch.o -o synch_test
+	$(CC) synch_test.o synch.o $(CLIBS) -o synch_test

 crypt_prog: crypt_prog.o crypt.o 
-	$(CC) crypt_prog.o crypt.o $(CRYPT_LIBS) -o crypt_prog
+	$(CC) crypt_prog.o crypt.o $(CRYPT_LIBS) $(CLIBS) -o crypt_prog

 clean:
 	rm -f *.o $(PROGS) core dependencies
--- a/lib/synch_test.C
+++ b/lib/synch_test.C
@ -3,6 +3,7 @@
 // -l       lock semaphore, sleep 10 secs, unlock

 #include <unistd.h>
+#include <strings.h>

 #include "synch.h"

--- a/sched/feeder.C
+++ b/sched/feeder.C
@ -43,6 +43,7 @@

 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <assert.h>
 #if HAVE_UNISTD_H
 #include <unistd.h>
--- a/sched/handle_request.C
+++ b/sched/handle_request.C
@ -17,6 +17,11 @@
 // Contributor(s):
 //

+#include <iostream>
+#include <vector>
+#include <string>
+using namespace std;
+
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/wait.h>
--- a/sched/main.C
+++ b/sched/main.C
@ -17,6 +17,10 @@
 // Contributor(s):
 //

+#include <iostream>
+#include <vector>
+#include <string>
+using namespace std;

 #include <stdio.h>
 #include <unistd.h>
--- a/sched/server_types.C
+++ b/sched/server_types.C
@ -17,6 +17,11 @@
 // Contributor(s):
 //

+#include <iostream>
+#include <vector>
+#include <string>
+using namespace std;
+
 #include <strings.h>
 #include <assert.h>

--- a/sched/show_shmem.C
+++ b/sched/show_shmem.C
@ -1,4 +1,6 @@
 #include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>

 #include "shmem.h"
 #include "sched_shmem.h"
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@ -51,10 +51,10 @@ LIBS = \
 .C.o:
 	$(CC) -c -o $*.o $<

-create_work: create_work.o $(CLIBS) $(LIBS) $(CRYPTO_LIBS)
+create_work: create_work.o $(LIBS) $(CRYPTO_LIBS)
 	$(CC) create_work.o $(CRYPTO_LIBS) $(CLIBS) $(LIBS) $(MYSQL_LIBS) -o create_work

-add: add.o $(CLIBS) $(LIBS) $(CRYPTO_LIBS)
+add: add.o $(LIBS) $(CRYPTO_LIBS)
 	$(CC) add.o $(CLIBS) $(LIBS) $(CRYPTO_LIBS) $(MYSQL_LIBS) -o add

 country_select: country_select.o ../lib/countries.o