From ff16cdebdaa07e579ed4bd5d918ce9a39667536c Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Thu, 3 Feb 2005 06:38:43 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=5292
---
 checkin_notes                   |   7 +++++++
 configure.ac                    |  27 ++++++++++++++++++++++++++-
 win_build/installerv2/BOINC.ism | Bin 205312 -> 205312 bytes
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/checkin_notes b/checkin_notes
index fffadf6c95..7eae7b8b8f 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -23870,3 +23870,10 @@ Rom    2 Feb 2005
 Rom    2 Feb 2005
     - Tag for 4.64 release, all platforms
       boinc_core_release_4_64
+
+Rom    2 Feb 2005
+    - Use the same technique to statically link nsl and socket for the client 
+      as the clientgui.
+
+    /
+        configure.ac
diff --git a/configure.ac b/configure.ac
index 6bb3581d2b..d3eca15fbf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -365,7 +365,32 @@ if ( test "${enable_client_release}" = yes ) && ( test "${enable_client}" = yes
    else
       GCC_EH_LIB=
    fi
-   CLIENTLIBS="-nodefaultlibs $LDSTATIC -lstdc++ -lgcc $GCC_EH_LIB $LDDYNAMIC -lpthread -lm  -lc"	
+
+   ## list of possible libraries, which we have to link statically against 
+   ## in order to avoid portability problems
+      
+   ## extend this list as necessary if you find additional libs required on your system
+   ## ****************************************
+   blacklist="nsl socket"
+   case $target in 
+      *linux*)
+         blacklist="$blacklist z"
+         ;;
+      *)
+         ;;
+   esac
+   ## ****************************************
+
+   ## now we walk through the blacklist and turn all matching libs found in 
+   ## into a static link-command
+   CLIENTLIBS="-nodefaultlibs $LDSTATIC -lstdc++ -lgcc $GCC_EH_LIB $LDDYNAMIC -lpthread -lm  -lc -lsocket -lnsl"	
+   echo "DEBUG: before mangling CLIENTLIBS='$CLIENTLIBS'" 
+   for somelib in ${blacklist}; do
+       CLIENTLIBS=`echo $CLIENTLIBS | sed -e"s/ -l${somelib} / $LDSTATIC -l${somelib} $LDDYNAMIC /g"`
+   done
+   echo "DEBUG: final link-line for CLIENTLIBS = $CLIENTLIBS"
+
+
 else
    CLIENTLIBS=
 fi
diff --git a/win_build/installerv2/BOINC.ism b/win_build/installerv2/BOINC.ism
index 191ccaca35131b7fa82dc6d2d8f8c6b31decfa90..5395f4e3ab79e37bb69fb7526d3d9c4f6a3ff444 100644
GIT binary patch
delta 430
zcmZoT!qaesXG0DPYr^tBitC#TS+*ClFg6KDC*^16CC8iSnVH0wXXd5kmlwxp=9Q%8
zR9Kj8mlS1uF2k+to0?bZm{gpaS2E3rv4T;0d!-R$2lI3zYewPi@@9+=g{OD9F>)~m
zZ1ZCLSHT&?%g-Um!OIc8o&7Lls5Fxt$M(2;jEfAna|<wiWuN{>hKYNb1QXMCZYid(
z%-os9*}(;g$*I+bM$6=wG`4fQF@05@9*_xCl*PodojVW2?VJeYP6BbKF@4paE@uX`
zEoj>@CPtR&j^~)9r|&t%B(~l56jQu_TD7a2fvJ(Jv4yUstFw!)iG`D~uA?!KFmQEr
zGjcREax*nHsGYv_7E>K3$kTcTK(Jl;Hq#-YZSR;o7{%2X7#ToV8i)mfSO<tX85p<6
zzh_#=G`Y4(eLK%5rkjkD6<I{4CwyVbny&DbNn(1z7bcVKr@k<mF|rmXmZcU=epo8I
zo&6irJ;r4}m;|Jg<BOAv^a@gvJb^)5l$l@Tl$mGf>gVX><GPK5`6T1^C!EYR0?Z5y
M4BL~XnCG$s0MBQI!2kdN

delta 399
zcmZoT!qaesXG0DPD}&hCrPG@WS+*ClFg6LORU2BkxSCoxIqNz)8#(HlSeO~>TDn@8
z>pD3*nL4>R8k?Dz8P{&-6J>lZGtG#xf>CXIr4eHXGmCF(Ug`8)b4LB`nr4h=gtvJy
z{;S}W<KX8I<lyB9+RlEMF;tpKf^U1=J;p_b+<D0v0Y&-gMTxlq+XR@tvM-ZhV&X2z
zsZ=OV%}GrzN!=#J^p$y;9FqojW^s0KL1J=hwV}~AH>R)3%d(hQrq9n{lHV?p$MjHn
z*(4yhZX%P`cKK;c*Yvj?V`60C^2{qPNzBPfO$pj|ifN(%r-`1Kv7P}COy7QsscyU7
zZKgv)lWUu#x4mQXU=-(MU}R7OVrd{21Y#W^27>MJ@0k`dZI}MU^ptVhHzw)HiYy}2
z6TUEIO;`BJBr(0<3zNzAQ(u_O7`ID*11aHPmR|OQNnpD)2lGir>7@M3yySS0#qs5t
mc`5nj#qpVWC8;?T7G~R@a5C2jFiKBPlwh8`{fiVc4?6&u&3$43