X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Fdynixptx.sh;h=b08dbc29d7443224d40bac2713ea1b48881d7863;hb=ed1af28e435c4f4992490e18b640d9daa5b5326a;hp=f726974d0fb3125ebc56d515a4b16fed215c39de;hpb=7e41cbf587d3939982dff81b53af233a1ae2406d;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/dynixptx.sh b/hints/dynixptx.sh
index f726974..b08dbc2 100644
--- a/hints/dynixptx.sh
+++ b/hints/dynixptx.sh
@@ -19,21 +19,40 @@ libswanted=`echo $libswanted | sed -e 's/ inet / /'`
 # Configure defaults to usenm='y', which doesn't work very well
 usenm='n'
 
-# for performance, apparently this makes a huge difference (~krader)
+# removed d_vfork='define'; we can't use it any more ...
 
-d_vfork='define'
-optimize='-Wc,-O3 -W0,-xstring'
+case "$optimize" in
+'') optimize='-Wc,-O3 -W0,-xstring' ;;
+esac
+
+# We override d_socket because it's very hard for Configure to get it right
+# in Dynix/Ptx, for several reasons.
+# (1) the socket interface is in libsocket.so -- this wouldn't be so hard
+#     for Configure to fathom...but it gets more tangled.
+# (2) if the system has been patched there can be libsocket.so.1.FOO.BAR,
+#     the FOO.BAR being the old version of the system before the patching.
+#     Configure picks up the old broken version.
+# (3) libsocket.so points to either libsocket.so.1 (v4.2)
+#     or libsocket.so.1.1 (v4.4)  The socket call in libsocket.so.1.1
+#     (BSD socket library) is called bsd_socket(), and has a macro wrapper
+#     to hide this.
+# This information kindly provided by Martin J. Bligh of Sequent.
+# As he puts it:
+# "Sequent has unusual capabilities, taking it above and beyond
+#  the complexity of any other vendor" :-)
+#
+# Jarkko Hietaniemi November 1998
 
 case "$osvers" in
-4.4*) # configure doesn't find sockets, as they're in libsocket, not libc
+4.[45]*) # configure doesn't find sockets, as they're in libsocket, not libc
         d_socket='define'
         d_oldsock='undef'
         d_sockpair='define'
         ;;
 4.2*) # on ptx/TCP 4.2, we can use BSD sockets, but they're not the default.
-        cppflags='-Wc,+bsd-socket'
-        ccflags='-Wc,+bsd-socket'
-        ldflags='-Wc,+bsd-socket'
+        cppflags="$cppflags -Wc,+bsd-socket"
+        ccflags="$ccflags -Wc,+bsd-socket"
+        ldflags="$ldflags -Wc,+bsd-socket"
         d_socket='define'
         d_oldsock='undef'
         d_sockpair='define'