From 53125a84a20c0d1f63a3cf091b5d6cadcd761228 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 27 Jan 2005 00:58:16 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=5216 --- checkin_notes | 5 +++++ client/Makefile.am | 2 +- clientgui/Makefile.am | 2 +- configure.ac | 45 ++++++++++++++++++++++--------------------- 4 files changed, 30 insertions(+), 24 deletions(-) diff --git a/checkin_notes b/checkin_notes index 6720452d7e..88da89d8ec 100755 --- a/checkin_notes +++ b/checkin_notes @@ -23272,3 +23272,8 @@ David 26 Jan 2005 sched/ handle_request.C + +David 26 Jan 2005 + - Reinhard's patch to configure.ac + + configure.ac diff --git a/client/Makefile.am b/client/Makefile.am index e0bcc83b70..92262533ae 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -9,7 +9,7 @@ include $(top_srcdir)/Makefile.incl client-bin: @CLIENT_BIN_FILENAME@ -LIBS += @LINUXLIBS@ +LIBS += @CLIENTLIBS@ bin_PROGRAMS = boinc_client diff --git a/clientgui/Makefile.am b/clientgui/Makefile.am index ade482db65..3f9a4ac71b 100644 --- a/clientgui/Makefile.am +++ b/clientgui/Makefile.am @@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.incl -LIBS += @LINUXLIBS@ +LIBS += @CLIENTLIBS@ bin_PROGRAMS = boinc_gui diff --git a/configure.ac b/configure.ac index 1463efad71..a2a365d89b 100644 --- a/configure.ac +++ b/configure.ac @@ -132,7 +132,7 @@ dnl Checks for libraries. AC_CHECK_LIB(m, sin) AC_CHECK_LIB(cygipc, shmget) -dnl NOTE: we might want to link the following libs statically on linux +dnl NOTE: we might want to link the following libs statically dnl for building portable binaries, so we store them in a separate variable dnl BOINC_EXTRA_LIBS for later post-processing instead of the default-action, dnl which would prepend them to LIBS @@ -319,42 +319,44 @@ AM_CONDITIONAL(ENABLE_CLIENT, [test "${enable_client}" = yes]) dnl ====================================================================== -dnl some vodoo required for building portable linux-binary (client, clientgui) +dnl some vodoo required for building portable client-binary (client, clientgui) dnl ====================================================================== -AC_ARG_ENABLE([linux-release], AS_HELP_STRING([--enable-linux-release], - [Try building a portable "release-candidate" for Linux: \ +AC_ARG_ENABLE([client-release], AS_HELP_STRING([--enable-client-release], + [Try building a portable "release-candidate" (currently implemented for Linux and Solaris only): \ this links libstd++ statically. You will probably need gcc-3.0 for - this to produce a portable linux-binary. + this to produce a portable client-binary. It is therefore recommended to use CC=gcc-3.0 and CXX=g++-3.0 for this. - (Default = no)]), [], [enable_linux_release=no]) + (Default = no)]), [], [enable_client_release=no]) dnl Some platform specific settings case $target in *linux* | *sun* ) - if ( test "${enable_linux_release}" = yes ) && ( test "${enable_client}" != yes ); then - AC_MSG_WARN([--enable-linux-release ignored. + if ( test "${enable_client_release}" = yes ) && ( test "${enable_client}" != yes ); then + AC_MSG_WARN([--enable-client-release ignored. -------------------------------------------------- -The switch --enable-linux-release is only useful for building the client and will be ignored +The switch --enable-client-release is only useful for building the client and will be ignored --------------------------------------------------]) else LDSTATIC="-Wl,-Bstatic" LDDYNAMIC="-Wl,-Bdynamic" fi ;; - *) ## in the non-linux case, --enable-linux-release is not allowed - if test "${enable_linux_release}" = yes; then - AC_MSG_ERROR([ + *) ## in the non-linux, non-solaris case, --enable-client-release is not allowed + if test "${enable_client_release}" = yes; then + AC_MSG_WARN([ ---------------------------------------------------------------------- -Sorry, the switch --linux-release is only meaningful when compiling for Linux! -Please don't use that switch otherwise. +Sorry, the switch --enable-client-release is currently only implemented +for Linux and Solaris, and will have no effect. ----------------------------------------------------------------------]) fi + LDSTATIC= + LDDYNAMIC= ;; esac -if ( test "${enable_linux_release}" = yes ) && ( test "${enable_client}" = yes ); then +if ( test "${enable_client_release}" = yes ) && ( test "${enable_client}" = yes ); then echo "----------" - echo "NOTE: Building portable Linux client binaries" + echo "NOTE: Building portable client binaries" echo "----------" AC_CHECK_LIB(gcc_eh, _Unwind_Resume, [have_gcc_eh=yes], [have_gcc_eh=no]) if test "$have_gcc_eh" = yes; then @@ -362,20 +364,20 @@ if ( test "${enable_linux_release}" = yes ) && ( test "${enable_client}" = yes ) else GCC_EH_LIB= fi - LINUXLIBS="-nodefaultlibs $LDSTATIC -lstdc++ -lgcc $GCC_EH_LIB $LDDYNAMIC -lpthread -lm -lc" + CLIENTLIBS="-nodefaultlibs $LDSTATIC -lstdc++ -lgcc $GCC_EH_LIB $LDDYNAMIC -lpthread -lm -lc" else - LINUXLIBS= + CLIENTLIBS= fi -AC_SUBST(LINUXLIBS) +AC_SUBST(CLIENTLIBS) ## -------------------- ## some more tweaking to turn non-standard libs into statically linked ones CLIENTGUIFLAGS="-DNOCLIPBOARD -DNOTASKBAR" CLIENTGUILIBS=${WX_LIBS} -if test "${enable_linux_release}" = yes; then +if test "${enable_client_release}" = yes; then ## list of possible libraries, which we have to link statically against - ## on Linux in order to avoid portability problems + ## in order to avoid portability problems ## extend this list as necessary if you find additional libs required on your system ## **************************************** @@ -413,7 +415,6 @@ AC_SUBST(CLIENTGUIFLAGS) AC_SUBST(CLIENTGUILIBS) dnl ====================================================================== - AC_CONFIG_FILES([ ./version.h api/Makefile