summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJarkko Hietaniemi <jhi@iki.fi>1998-11-12 17:07:45 +0000
committerJarkko Hietaniemi <jhi@iki.fi>1998-11-12 17:07:45 +0000
commit5cc3184f095c2423ebcaec0ecbd6015ae414670e (patch)
tree5ab82c694d2c19aafafbce4b99d450ea0157f1db
parent7e41cbf587d3939982dff81b53af233a1ae2406d (diff)
downloadperl-5cc3184f095c2423ebcaec0ecbd6015ae414670e.tar.gz
Allow hints file override for d_socket
(based on Sequent-induced change #2229). p4raw-link: @2229 on //depot/cfgperl: 7e41cbf587d3939982dff81b53af233a1ae2406d p4raw-id: //depot/cfgperl@2230
-rwxr-xr-xConfigure61
1 files changed, 33 insertions, 28 deletions
diff --git a/Configure b/Configure
index a3a8319450..3726734f61 100755
--- a/Configure
+++ b/Configure
@@ -20,7 +20,7 @@
# $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
#
-# Generated on Thu Nov 5 14:26:57 EET 1998 [metaconfig 3.0 PL70]
+# Generated on Thu Nov 12 19:00:08 EET 1998 [metaconfig 3.0 PL70]
# (with additional metaconfig patches by jhi@iki.fi)
cat >/tmp/c1$$ <<EOF
@@ -7524,7 +7524,7 @@ if set socket val -f d_socket; eval $csym; $val; then
if set setsockopt val -f; eval $csym; $val; then
d_oldsock="$undef"
else
- echo "...but it uses the old 4.1c interface, rather than 4.2" >&4
+ echo "...but it uses the old BSD 4.1c interface, rather than 4.2" >&4
d_oldsock="$define"
fi
else
@@ -7535,34 +7535,39 @@ else
d_oldsock="$undef"
else
echo "You don't have Berkeley networking in libc$_a..." >&4
- for net in net socket
- do
- if test -f /usr/lib/lib$net$_a; then
- ( ($nm $nm_opt /usr/lib/lib$net$_a | eval $nm_extract) || \
- $ar t /usr/lib/lib$net$_a) 2>/dev/null >> libc.list
- if $contains socket libc.list >/dev/null 2>&1; then
- d_socket="$define"
- case "$net" in
- net)
- echo "...but the Wollongong group seems to have hacked it in." >&4
- socketlib="-lnet"
- sockethdr="-I/usr/netinclude"
- ;;
- esac
- if $contains setsockopt libc.list >/dev/null 2>&1; then
- d_oldsock="$undef"
- else
- echo "...using the old 4.1c interface, rather than 4.2" >&4
- d_oldsock="$define"
+ if test "X$d_socket" = "X$define"; then
+ echo "...but you seem to believe that you have sockets." >&4
+ else
+ for net in net socket
+ do
+ if test -f /usr/lib/lib$net$_a; then
+ ( ($nm $nm_opt /usr/lib/lib$net$_a | eval $nm_extract) || \
+ $ar t /usr/lib/lib$net$_a) 2>/dev/null >> libc.list
+ if $contains socket libc.list >/dev/null 2>&1; then
+ d_socket="$define"
+ socketlib="-l$net"
+ case "$net" in
+ net)
+ echo "...but the Wollongong group seems to have hacked it in." >&4
+ sockethdr="-I/usr/netinclude"
+ ;;
+ esac
+ echo "Found Berkeley sockets interface in lib$net." >& 4
+ if $contains setsockopt libc.list >/dev/null 2>&1; then
+ d_oldsock="$undef"
+ else
+ echo "...using the old BSD 4.1c interface, rather than 4.2." >&4
+ d_oldsock="$define"
+ fi
+ break
fi
- break
fi
+ done
+ if test "X$d_socket" != "X$define"; then
+ echo "or anywhere else I see." >&4
+ d_socket="$undef"
+ d_oldsock="$undef"
fi
- done
- if test "X$d_socket" != "X$define"; then
- echo "or anywhere else I see." >&4
- d_socket="$undef"
- d_oldsock="$undef"
fi
fi
fi
@@ -10526,7 +10531,7 @@ if eval $compile_ok; then
echo "Nope, no EBCDIC. Assuming ASCII or some ISO Latin." >&4
fi
else
- echo "$me: I'm unable to compile the test program." >&4
+ echo "I'm unable to compile the test program." >&4
echo "I'll assume ASCII or some ISO Latin." >&4
fi
$rm -f tebcdic.c tebcdic