X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Fsolaris_2.sh;h=82e394123885fb7785331ad4bf65511e694d4e41;hb=696814337d4eac8d0663d5307d6e01964d1b2897;hp=ea6d89783511b829221970467d04549b8a416da1;hpb=6024848b1ae78de231e00d7cbcffeaf4124ad57f;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/solaris_2.sh b/hints/solaris_2.sh
index ea6d897..82e3941 100644
--- a/hints/solaris_2.sh
+++ b/hints/solaris_2.sh
@@ -404,13 +404,6 @@ EOM
 	if test "`arch`" = i86pc -a `uname -r` = 5.6 && \
 	   ${cc:-cc} try.c -lpthread >/dev/null 2>&1 && ./a.out; then
 	    d_sigsetjmp=$undef
-	    cat << 'EOM' >&2
-
-You will see a *** WHOA THERE!!! ***  message from Configure for
-d_sigsetjmp.  Keep the recommended value.  See hints/solaris_2.sh
-for more information.
-
-EOM
 	fi
 
 	# These prototypes should be visible since we using
@@ -556,12 +549,13 @@ EOM
 		    ccflags="$ccflags -mcpu=v9"
 		fi 
 		ccflags="$ccflags -m64"
-		if test $processor = sparc -a X`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null` != X; then
-		    # This adds in -Wa,-xarch=v9.  I suspect that's superfluous,
-		    # since the -m64 above should do that already.  Someone
-		    # with gcc-3.x.x, please test with gcc -v.   A.D. 20-Nov-2003
-		    # ccflags="$ccflags -Wa,`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`"
-		fi
+
+		# This adds in -Wa,-xarch=v9.  I suspect that's superfluous,
+		# since the -m64 above should do that already.  Someone
+		# with gcc-3.x.x, please test with gcc -v.   A.D. 20-Nov-2003
+#		if test $processor = sparc -a X`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null` != X; then
+#		    ccflags="$ccflags -Wa,`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`"
+#		fi
 		ldflags="$ldflags -m64"
 		lddlflags="$lddlflags -G -m64"
 		;;
@@ -636,3 +630,17 @@ fi
 EOOVER
 
 rm -f try.c try.o try a.out
+
+# If using C++, the Configure scan for dlopen() will fail in Solaris
+# because one of the two (1) an extern "C" linkage definition is needed
+# (2) #include <dlfcn.h> is needed, *and* a cast to (void*(*)())
+# is needed for the &dlopen.  Adding any of these would require changing
+# a delicate spot in Configure, so easier just to force our guess here
+# for Solaris.  Much the same goes for dlerror().
+case "$cc" in
+*g++*|*CC*)
+  d_dlopen='define'
+  d_dlerror='define'
+  ;;
+esac
+