From 332cfa9502cc9e435653b8f18a4fcab375775cfc Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Fri, 7 Oct 2005 20:00:15 +0000
Subject: [PATCH] build fixes

svn path=/trunk/boinc/; revision=8553
---
 Makefile.incl       |  1 +
 checkin_notes       |  9 +++++++++
 m4/sah_check_lib.m4 | 15 ++++++++++++---
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/Makefile.incl b/Makefile.incl
index 511badd3b7..212af22688 100644
--- a/Makefile.incl
+++ b/Makefile.incl
@@ -13,6 +13,7 @@ SCHED_LIB = -L$(top_builddir)/sched -lsched
 BOINC_LIB = -L$(top_builddir)/lib -lboinc
 
 AM_CPPFLAGS =					\
+        @PICFLAGS@				\
         -I$(top_srcdir)/lib			\
         -I$(top_srcdir)/api			\
         -I$(top_srcdir)/db			\
diff --git a/checkin_notes b/checkin_notes
index 929ede0664..907504bc19 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -12829,3 +12829,12 @@ David  7 Oct 2005
     html/user/
         edit_passwd_action.php
         sample_get_project_config.php
+
+David  7 Oct 2005
+    - A couple of build-system changes,
+        which I believe are from Eric Korpela but I'm not sure.
+        Reinhard, please make sure these are OK
+
+    Makefile.incl
+    m4/
+        sah_check_lib.m4
diff --git a/m4/sah_check_lib.m4 b/m4/sah_check_lib.m4
index df8532f76f..ff40cad1bc 100644
--- a/m4/sah_check_lib.m4
+++ b/m4/sah_check_lib.m4
@@ -325,8 +325,10 @@ AC_DEFUN([SAH_DYNAMIC_LIB],[
 #in order to find a static version of the library being loaded.  
 AC_DEFUN([SAH_FIND_STATIC_LIB],[
 # libtool sets up the variable shlibpath_var which holds the name of the 
-# LIB_PATH variable
-tmp_libpath=`eval echo '${'$shlibpath_var'}'`
+# LIB_PATH variable.  We also want to strip the sparcv9 and 64s from the
+# path, because we'll add them again later
+strip_pattern="s/sparcv9//g; s/lib64/lib/g; s/lib\/64/lib/g"
+tmp_libpath=`eval echo '${'$shlibpath_var'}' | sed "${strip_pattern}"`
 
 # in cygwin, the DLLs are in the path, but the static libraries are elsewhere.
 # Here's an educated guess.
@@ -336,6 +338,8 @@ then
   tmp_libpath="${tmp_libpath}:${PATH}"
 fi  
 
+
+
 gcc_version=`${CC} -v 2>&1 | grep "gcc version" | $AWK '{print $[]3}'`
 
 for gcc_host in `${CC} -v 2>&1 | grep host` --host=${ac_cv_target}
@@ -358,6 +362,11 @@ do
   fi
 done
 
+# now lets add any directories in LIBS or LDFLAGS
+tmp_more_dirs=`echo $LIBS $LDFLAGS | $AWK '{for (i=1;i<(NF+1);i++) { printf("x%s\n",$[]i); }}' | grep x-L | sed 's/x-L//' | $AWK '{printf("%s:",$[]1);}'`
+tmp_libpath="${tmp_more_dirs}${tmp_libpath}"
+
+
 # Put machine/arch specific tweaks to the libpath here.
 if test -z "${COMPILER_MODEL_BITS}"
 then
@@ -404,7 +413,7 @@ case $target in
 	  do
 	    abcd_r="${abcd_r}:${tmp_dir}/${tmp_arch}"
 	  done
-	  tmp_libpath="${abcd_r}:${abcd_q}:${tmp_libpath}"
+	  tmp_libpath="${abcd_r}:${abcd_q}:${tmp_libpath}" 
         fi
 	;;
   *)