Comedy of typing errors.

[perl5.git] / hints / solaris_2.sh

diff --git a/hints/solaris_2.sh b/hints/solaris_2.sh
index f89842a..138be7b 100644 (file)
--- a/hints/solaris_2.sh
+++ b/hints/solaris_2.sh
@@ -94,6 +94,20 @@ case "$workshoplibpth_done" in
 esac
 EOCBU
 
+case "$cc" in
+'')    if test -f /opt/SUNWspro/bin/cc; then
+               cat <<EOF >&4   
+
+You specified no cc but you seem to have the Workshop compiler installed,
+using that.  If you want something else, specify that in the command line,
+e.g. Configure -Dcc=gcc
+
+EOF
+               cc=/opt/SUNWspro/bin/cc
+       fi
+       ;;
+esac
+
 ######################################################
 # General sanity testing.  See below for excerpts from the Solaris FAQ.
 #
@@ -119,7 +133,7 @@ esac
 
 # Check that /dev/fd is mounted.  If it is not mounted, let the
 # user know that suid scripts may not work.
-/usr/bin/df /dev/fd 2>&1 > /dev/null
+df /dev/fd 2>&1 > /dev/null
 case $? in
 0) ;;
 *)
@@ -252,15 +266,21 @@ END
            # apparently don't reveal that unless you pass in -V.
            # (This may all depend on local configurations too.)
 
+           # Recompute verbose with -Wl,-v to find GNU ld if present
+           verbose=`${cc:-cc} -v -Wl,-v -o try try.c 2>&1 | grep ld 2>&1`
+
            myld=`echo $verbose| grep ld | awk '/\/ld/ {print $1}'`
            # This assumes that gcc's output will not change, and that
            # /full/path/to/ld will be the first word of the output.
-           # Thus myld is something like opt/gnu/sparc-sun-solaris2.5/bin/ld
+           # Thus myld is something like /opt/gnu/sparc-sun-solaris2.5/bin/ld
 
-           if $myld -V 2>&1 | grep "ld: Software Generation Utilities" >/dev/null 2>&1; then
+           # Allow that $myld may be '', due to changes in gcc's output 
+           if ${myld:-ld} -V 2>&1 |
+               grep "ld: Software Generation Utilities" >/dev/null 2>&1; then
                # Ok, /usr/ccs/bin/ld eventually does get called.
                :
            else
+               echo "Found GNU ld='$myld'" >&4
                cat <<END >&2
 
 NOTE: You are using GNU ld(1).  GNU ld(1) might not build Perl.  If you
@@ -385,6 +405,27 @@ for more information.
 
 EOM
         fi
+
+       # These prototypes should be visible since we using
+       # -D_REENTRANT, but that does not seem to work.
+       # It does seem to work for getnetbyaddr_r, weirdly enough,
+       # and other _r functions. (Solaris 8)
+
+       d_ctermid_r_proto="$define"
+       d_gethostbyaddr_r_proto="$define"
+       d_gethostbyname_r_proto="$define"
+       d_getnetbyname_r_proto="$define"
+       d_getprotobyname_r_proto="$define"
+       d_getprotobynumber_r_proto="$define"
+       d_getservbyname_r_proto="$define"
+       d_getservbyport_r_proto="$define"
+
+       # Ditto. (Solaris 7)
+       d_readdir_r_proto="$define"
+       d_readdir64_r_proto="$define"
+       d_tmpnam_r_proto="$define"
+       d_ttyname_r_proto="$define"
+
        ;;
 esac
 EOCBU