diff --git a/aclocal.m4 b/aclocal.m4 index 36f60ac77d..c168a8eef1 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- +# generated automatically by aclocal 1.7 -*- Autoconf -*- -# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -51,7 +51,7 @@ else fi AC_CONFIG_COMMANDS_PRE( [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([conditional \"$1\" was never defined. + AC_MSG_ERROR([conditional "$1" was never defined. Usually this means the macro was only invoked conditionally.]) fi])]) @@ -87,7 +87,7 @@ fi])]) # CC etc. in the Makefile, will ask for an AC_PROG_CC use... -AC_PREREQ([2.52]) +AC_PREREQ([2.54]) # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow # the ones we care about. @@ -113,6 +113,16 @@ if test "`cd $srcdir && pwd`" != "`pwd`" && AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) fi +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) + # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], @@ -144,17 +154,29 @@ AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl _AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_][CC], +[AC_PROVIDE_IFELSE([AC_PROG_CC], [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_][CC], - defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_][CXX], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_][CXX], - defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ]) ]) + +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[_am_stamp_count=`expr ${_am_stamp_count-0} + 1` +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) + # Copyright 2002 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -175,14 +197,14 @@ AC_PROVIDE_IFELSE([AC_PROG_][CXX], # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"]) +AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.6.3])]) + [AM_AUTOMAKE_VERSION([1.7])]) # Helper functions for option handling. -*- Autoconf -*- @@ -577,6 +599,9 @@ else fi ]) AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) ]) @@ -696,7 +721,9 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*- +# Check to see how 'make' treats includes. -*- Autoconf -*- + +# Copyright (C) 2001, 2002 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -736,7 +763,7 @@ echo "include confinc" > confmf # In particular we don't look at `^make:' because GNU make might # be invoked under some other name (usually "gmake"), in which # case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then +if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then am__include=include am__quote= _am_result=GNU @@ -759,7 +786,7 @@ rm -f confinc confmf # Add --enable-maintainer-mode option to configure. # From Jim Meyering -# Copyright 1996, 1998, 2000, 2001 Free Software Foundation, Inc. +# Copyright 1996, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -776,7 +803,7 @@ rm -f confinc confmf # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. -# serial 1 +# serial 2 AC_DEFUN([AM_MAINTAINER_MODE], [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) @@ -793,6 +820,8 @@ AC_DEFUN([AM_MAINTAINER_MODE], ] ) +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + dnl $Id$ @@ -1077,7 +1106,7 @@ AC_DEFUN([SAH_HEADER_STDCXX],[ # # Revision Log: # $Log$ -# Revision 1.162 2004/11/04 19:30:47 davea +# Revision 1.163 2004/11/05 19:38:06 davea # *** empty log message *** # # Revision 1.1 2003/12/11 18:38:24 korpela @@ -1168,58 +1197,6 @@ AC_PREREQ([2.52]) # serial 6 -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. We must strip everything past the first ":", -# and everything past the last "/". - -# _AM_DIRNAME(PATH) -# ----------------- -# Like AS_DIRNAME, only do it during macro expansion -AC_DEFUN([_AM_DIRNAME], - [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1, - m4_if(regexp([$1], [^//\([^/]\|$\)]), -1, - m4_if(regexp([$1], [^/.*]), -1, - [.], - patsubst([$1], [^\(/\).*], [\1])), - patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])), - patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl -])# _AM_DIRNAME - - -# The stamp files are numbered to have different names. -# We could number them on a directory basis, but that's additional -# complications, let's have a unique counter. -m4_define([_AM_STAMP_Count], [0]) - - -# _AM_STAMP(HEADER) -# ----------------- -# The name of the stamp file for HEADER. -AC_DEFUN([_AM_STAMP], -[m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl -AS_ESCAPE(_AM_DIRNAME(patsubst([$1], - [:.*])))/stamp-h[]_AM_STAMP_Count]) - - -# _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS) -# ------------------------------------------------------------ -# We used to try to get a real timestamp in stamp-h. But the fear is that -# that will cause unnecessary cvs conflicts. -AC_DEFUN([_AM_CONFIG_HEADER], -[# Add the stamp file to the list of files AC keeps track of, -# along with our hook. -AC_CONFIG_HEADERS([$1], - [# update the timestamp -echo 'timestamp for $1' >"_AM_STAMP([$1])" -$2], - [$3]) -])# _AM_CONFIG_HEADER - - -# AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS) -# -------------------------------------------------------------- -AC_DEFUN([AM_CONFIG_HEADER], -[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])]) -])# AM_CONFIG_HEADER +# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. +AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) diff --git a/checkin_notes b/checkin_notes index e28acabdd7..6c419fdcb0 100755 --- a/checkin_notes +++ b/checkin_notes @@ -19083,3 +19083,18 @@ David 4 Nov 2004 configure.ac client Makefile.am + +David 5 Nov + - get clientgui to compile on Solaris. + - include + - add NOCLIPBOARD flag in Makefile, + since Solaris WxWidgets doesn't seem to know about clipboard + NOTE: it compiles but crashes + - don't include boinc_api.h in util.C: ??? + + clientgui/ + Makefile.old + ViewMessages.cpp,h + stdwx.h + lib/ + util.C diff --git a/clientgui/Makefile.old b/clientgui/Makefile.old index 66788eb370..0763eaae46 100644 --- a/clientgui/Makefile.old +++ b/clientgui/Makefile.old @@ -1,9 +1,9 @@ CXX = $(shell wx-config --cxx) # comment out the following as needed -#OTHER_LIBS = -lsocket -lnsl +OTHER_LIBS = -lsocket -lnsl -CFLAGS = -g -I ../lib -DNOTASKBAR +CFLAGS = -g -I ../lib -DNOTASKBAR -DNOCLIPBOARD -DDEBUG PROGRAM = boincmgr diff --git a/clientgui/ViewMessages.cpp b/clientgui/ViewMessages.cpp index 8b6ea63ea0..f5490b3629 100644 --- a/clientgui/ViewMessages.cpp +++ b/clientgui/ViewMessages.cpp @@ -266,6 +266,8 @@ void CViewMessages::OnTaskLinkClicked( const wxHtmlLinkInfo& link ) if ( link.GetHref() == SECTION_TASK ) m_bTaskHeaderHidden ? m_bTaskHeaderHidden = false : m_bTaskHeaderHidden = true; + +#ifndef NOCLIPBOARD else if ( link.GetHref() == LINK_TASKCOPYALL ) { wxInt32 iRowCount = 0; @@ -297,6 +299,8 @@ void CViewMessages::OnTaskLinkClicked( const wxHtmlLinkInfo& link ) CloseClipboard(); } +#endif + else if ( link.GetHref() == SECTION_TIPS ) m_bTipsHeaderHidden ? m_bTipsHeaderHidden = false : m_bTipsHeaderHidden = true; @@ -443,6 +447,7 @@ wxInt32 CViewMessages::FormatMessage( wxInt32 item, wxString& strBuffer ) const } +#ifndef NOCLIPBOARD bool CViewMessages::OpenClipboard() { bool bRetVal = false; @@ -505,3 +510,4 @@ bool CViewMessages::CloseClipboard() return bRetVal; } +#endif diff --git a/clientgui/ViewMessages.h b/clientgui/ViewMessages.h index ec53fba59f..796e22c8cb 100644 --- a/clientgui/ViewMessages.h +++ b/clientgui/ViewMessages.h @@ -64,8 +64,13 @@ private: wxListItemAttr* m_pMessageInfoAttr; wxListItemAttr* m_pMessageErrorAttr; +#ifndef NOCLIPBOARD bool m_bClipboardOpen; wxString m_strClipboardData; + bool OpenClipboard(); + wxInt32 CopyToClipboard( wxInt32 item ); + bool CloseClipboard(); +#endif virtual void UpdateSelection(); virtual void UpdateTaskPane(); @@ -73,11 +78,6 @@ private: wxInt32 FormatProjectName( wxInt32 item, wxString& strBuffer ) const; wxInt32 FormatTime( wxInt32 item, wxString& strBuffer ) const; wxInt32 FormatMessage( wxInt32 item, wxString& strBuffer ) const; - - bool OpenClipboard(); - wxInt32 CopyToClipboard( wxInt32 item ); - bool CloseClipboard(); - }; diff --git a/clientgui/stdwx.h b/clientgui/stdwx.h index 2209e3394e..d2f589dcc4 100644 --- a/clientgui/stdwx.h +++ b/clientgui/stdwx.h @@ -112,6 +112,7 @@ // C++ headers #include +#include #include #include #include diff --git a/lib/util.C b/lib/util.C index a968ab3d00..3cabe8efa6 100755 --- a/lib/util.C +++ b/lib/util.C @@ -48,7 +48,6 @@ #include "error_numbers.h" #include "filesys.h" #include "util.h" -#include "boinc_api.h" #ifdef _USING_FCGI_ #include "fcgi_stdio.h"