Index: init.csh.in
===================================================================
RCS file: /cvsroot/fink/base-files/init.csh.in,v
retrieving revision 1.17
diff -u -3 -p -u -r1.17 init.csh.in
--- init.csh.in	1 Mar 2005 14:35:54 -0000	1.17
+++ init.csh.in	1 Jul 2005 15:07:25 -0000
@@ -38,8 +38,9 @@ else
     setenv PATH BASEPATH/bin:BASEPATH/sbin:/bin:/sbin:/usr/bin:/usr/sbin
 endif
 
+set osMajorVersion = `uname -r | cut -d. -f1`
 if ( ! $?MANPATH ) then
-  if (`uname -r | cut -d. -f1` > 7) then
+  if ( $osMajorVersion > 7) then
     setenv MANPATH `/usr/bin/manpath`
   else
     setenv MANPATH `/usr/bin/manpath -q`
@@ -78,6 +79,16 @@ if ( -r /usr/X11R6/man ) then
     append_path MANPATH /usr/X11R6/man
 endif
 
+# On Mac OS X 10.4 there is a dyld bug (rdar://problem/4139432)
+# where a library will not load if a library with a matching basename
+# is already loaded from one of the system paths,
+# the workaround is to set DYLD_FALLBACK_LIBRARY_PATH to :
+if ( ! $?DYLD_FALLBACK_LIBRARY_PATH ) then
+  if (  $osMajorVersion > 7) then
+    setenv DYLD_FALLBACK_LIBRARY_PATH :
+  endif
+endif
+
 if ($?version) then
   if ("$version" =~ tcsh*) then
     complete fink 'n/fink/(install remove purge update selfupdate update-all configure list apropos describe index validate --help --version)/'
Index: init.sh.in
===================================================================
RCS file: /cvsroot/fink/base-files/init.sh.in,v
retrieving revision 1.18
diff -u -3 -p -u -r1.18 init.sh.in
--- init.sh.in	1 Mar 2005 14:35:54 -0000	1.18
+++ init.sh.in	1 Jul 2005 15:07:25 -0000
@@ -50,8 +50,9 @@ else
 fi
 export PATH
 
+osMajorVer=`uname -r | cut -d. -f1`
 if [ -z "$MANPATH" ]; then
-  if [ `uname -r | cut -d. -f1` -gt 7 ]; then
+  if [ $osMajorVer -gt 7 ]; then
     MANPATH=`/usr/bin/manpath`
   else
     MANPATH=`/usr/bin/manpath -q`
@@ -96,6 +97,17 @@ if [ -r /usr/X11R6/man ]; then
     export MANPATH
 fi
 
+# On Mac OS X 10.4 there is a dyld bug (rdar://problem/4139432)
+# where a library will not load if a library with a matching basename
+# is already loaded from one of the system paths,
+# the workaround is to set DYLD_FALLBACK_LIBRARY_PATH to :
+if [ -z "$DYLD_FALLBACK_LIBRARY_PATH" ]; then
+  if [ $osMajorVer -gt 7 ]; then
+    DYLD_FALLBACK_LIBRARY_PATH=:
+    export DYLD_FALLBACK_LIBRARY_PATH
+  fi
+fi
+
 PROXYHTTP=`grep ProxyHTTP BASEPATH/etc/fink.conf | grep -v "#" | cut -d " " -f2`
 
 if [ "$PROXYHTTP" != "" ]; then