Continue cpp symbol update.

[p5sagit/p5-mst-13.2.git] / hints / freebsd.sh

diff --git a/hints/freebsd.sh b/hints/freebsd.sh
index 66f6ca0..2609261 100644 (file)
--- a/hints/freebsd.sh
+++ b/hints/freebsd.sh
@@ -121,6 +121,13 @@ case "$osvers" in
        ;;
 esac
 
+case "$osvers" in
+4.0*)
+       if /usr/bin/file /usr/lib/libc.so.3 | /usr/bin/grep -vq "not stripped" ; then
+           usenm=false
+       fi
+esac
+
 cat <<'EOM' >&4
 
 Some users have reported that Configure halts when testing for
@@ -147,8 +154,8 @@ case "$osvers" in
     # the equivalent in the main Configure so we copy a little
     # from Configure XXX Configure should be fixed.
     if $test -r $src/patchlevel.h;then
-       patchlevel=`awk '/define[       ]+PATCHLEVEL/ {print $3}' $src/patchlevel.h`
-       subversion=`awk '/define[       ]+SUBVERSION/ {print $3}' $src/patchlevel.h`
+       patchlevel=`awk '/define[       ]+PERL_VERSION/ {print $3}' $src/patchlevel.h`
+       subversion=`awk '/define[       ]+PERL_SUBVERSION/ {print $3}' $src/patchlevel.h`
     else
        patchlevel=0
        subversion=0
@@ -164,7 +171,7 @@ esac
 cat > UU/usethreads.cbu <<'EOCBU'
 case "$usethreads" in
 $define|true|[yY]*)
-        lc_r=`/sbin/ldconfig -r|grep ':-lc_r'|awk '{print $NF}'`
+        lc_r=`/sbin/ldconfig -r|grep ':-lc_r'|awk '{print $NF}'|tail -1`
         case "$osvers" in  
        2.2.8*|3.*|4.*)
              if [ ! -r "$lc_r" ]; then