---- perl5.003_06/Configure Fri Oct 4 11:08:50 1996
-+++ Configure Wed Oct 9 17:53:14 1996
-@@ -1451,7 +1451,7 @@
+--- Configure.orig Fri Aug 1 23:12:26 1997
++++ Configure Fri Aug 1 23:20:24 1997
+@@ -1489,7 +1489,7 @@
*)
echo "I don't know where '$file' is, and my life depends on it." >&4
echo "Go find a public domain implementation or fix your PATH setting!" >&4
;;
esac
done
-@@ -1460,7 +1460,9 @@
+@@ -1498,7 +1498,9 @@
say=offhand
for file in $trylist; do
xxx=`./loc $file $file $pth`
eval _$file=$xxx
case "$xxx" in
/*)
-@@ -3091,7 +3093,7 @@
+@@ -3198,7 +3200,7 @@
exit(0);
}
EOM
gccversion=`./gccvers`
case "$gccversion" in
'') echo "You are not using GNU cc." ;;
-@@ -3275,6 +3277,12 @@
+@@ -3401,6 +3403,12 @@
*"-l$thislib "*);;
*) dflt="$dflt -l$thislib";;
esac
else
echo "No -l$thislib."
fi
-@@ -3387,7 +3395,7 @@
+@@ -3950,7 +3958,7 @@
esac
;;
esac
case "$libs" in
'') ;;
*) for thislib in $libs; do
-@@ -3401,12 +3409,14 @@
- :
- elif try=`./loc lib$thislib.$so X $libpth`; $test -f "$try"; then
- :
-- elif try=`./loc lib$thislib.a X $libpth`; $test -f "$try"; then
-+ elif try=`./loc lib$thislib$lib_ext X $libpth`; $test -f "$try"; then
- :
- elif try=`./loc lib$thislib X $libpth`; $test -f "$try"; then
+@@ -3972,6 +3980,8 @@
:
elif try=`./loc $thislib X $libpth`; $test -f "$try"; then
:
+ elif try=`./loc $thislib$lib_ext X $libpth`; $test -f "$try"; then
+ :
- elif try=`./loc Slib$thislib.a X $xlibpth`; $test -f "$try"; then
+ elif try=`./loc Slib$thislib$lib_ext X $xlibpth`; $test -f "$try"; then
:
else
-@@ -3457,11 +3467,11 @@
- fi
- elif $test -r "$libc" || (test -h "$libc") >/dev/null 2>&1; then
- echo "Your C library seems to be in $libc, as you said before."
--elif $test -r $incpath/usr/lib/libc.a; then
-- libc=$incpath/usr/lib/libc.a;
-+elif $test -r $incpath/usr/lib/libc$lib_ext; then
-+ libc=$incpath/usr/lib/libc$lib_ext;
- echo "Your C library seems to be in $libc. That's fine."
--elif $test -r /lib/libc.a; then
-- libc=/lib/libc.a;
-+elif $test -r /lib/libc$lib_ext; then
-+ libc=/lib/libc$lib_ext;
- echo "Your C library seems to be in $libc. You're normal."
- else
- if tans=`./loc libc.a blurfl/dyick $libpth`; $test -r "$tans"; then
-@@ -3583,6 +3593,10 @@
+@@ -4156,6 +4166,10 @@
eval $xscan;\
$contains '^fprintf$' libc.list >/dev/null 2>&1; then
eval $xrun
else
nm -p $* 2>/dev/null >libc.tmp
$grep fprintf libc.tmp > libc.ptf
-@@ -3593,23 +3607,33 @@
+@@ -4166,23 +4180,33 @@
eval $xrun
else
echo " "
done
echo "Ok." >&4
else
-@@ -5606,7 +5630,7 @@
- exit(0);
- }
+@@ -5611,15 +5635,15 @@
EOCP
-- if $cc $ccflags try.c -o try >/dev/null 2>&1 && ./try > /dev/null; then
-+ if $cc $ccflags $ldflags try.c -o try >/dev/null 2>&1 && ./try > /dev/null; then
- intsize=`./try`
- echo "Your integers are $intsize bytes long."
+ : check sys/file.h first, no particular reason here
+ if $test `./findhdr sys/file.h` && \
+- $cc $cppflags -DI_SYS_FILE access.c -o access >/dev/null 2>&1 ; then
++ $cc $ldflags $cppflags -DI_SYS_FILE access.c -o access >/dev/null 2>&1 ; then
+ h_sysfile=true;
+ echo "<sys/file.h> defines the *_OK access constants." >&4
+ elif $test `./findhdr fcntl.h` && \
+- $cc $cppflags -DI_FCNTL access.c -o access >/dev/null 2>&1 ; then
++ $cc $ldflags $cppflags -DI_FCNTL access.c -o access >/dev/null 2>&1 ; then
+ h_fcntl=true;
+ echo "<fcntl.h> defines the *_OK access constants." >&4
+ elif $test `./findhdr unistd.h` && \
+- $cc $cppflags -DI_UNISTD access.c -o access >/dev/null 2>&1 ; then
++ $cc $ldflags $cppflags -DI_UNISTD access.c -o access >/dev/null 2>&1 ; then
+ echo "<unistd.h> defines the *_OK access constants." >&4
else
-@@ -5686,7 +5710,7 @@
+ echo "I can't find the four *_OK access constants--I'll use mine." >&4
+@@ -5913,7 +5937,7 @@
exit(result);
}
EOCP
./try
yyy=$?
else
-@@ -5767,7 +5791,7 @@
+@@ -5994,7 +6018,7 @@
}
EOCP
./try
castflags=$?
else
-@@ -5806,7 +5830,7 @@
+@@ -6033,7 +6057,7 @@
exit((unsigned long)vsprintf(buf,"%s",args) > 10L);
}
EOF
echo "Your vsprintf() returns (int)." >&4
val2="$undef"
else
-@@ -5876,7 +5900,7 @@
- cryptlib=-lcrypt
- fi
- if $test -z "$cryptlib"; then
-- cryptlib=`./loc libcrypt.a "" $libpth`
-+ cryptlib=`./loc libcrypt$lib_ext "" $libpth`
- else
- cryptlib=-lcrypt
- fi
-@@ -6148,7 +6172,7 @@
+@@ -6381,7 +6405,7 @@
EOCP
: check sys/file.h first to get FREAD on Sun
if $test `./findhdr sys/file.h` && \
-- $cc $cppflags "-DI_SYS_FILE" open3.c -o open3 >/dev/null 2>&1 ; then
-+ $cc $cppflags $ldflags "-DI_SYS_FILE" open3.c -o open3 >/dev/null 2>&1 ; then
+- $cc $ccflags "-DI_SYS_FILE" -o open3 $ldflags open3.c $libs >/dev/null 2>&1 ; then
++ $cc $ldflags $ccflags "-DI_SYS_FILE" -o open3 $ldflags open3.c $libs >/dev/null 2>&1 ; then
h_sysfile=true;
echo "<sys/file.h> defines the O_* constants..." >&4
if ./open3; then
-@@ -6159,7 +6183,7 @@
+@@ -6392,7 +6416,7 @@
val="$undef"
fi
elif $test `./findhdr fcntl.h` && \
-- $cc "-DI_FCNTL" open3.c -o open3 >/dev/null 2>&1 ; then
-+ $cc "-DI_FCNTL" $ldflags open3.c -o open3 >/dev/null 2>&1 ; then
+- $cc $ccflags "-DI_FCNTL" -o open3 $ldflags open3.c $libs >/dev/null 2>&1 ; then
++ $cc $ldflags $ccflags "-DI_FCNTL" -o open3 $ldflags open3.c $libs >/dev/null 2>&1 ; then
h_fcntl=true;
echo "<fcntl.h> defines the O_* constants..." >&4
if ./open3; then
-@@ -6642,7 +6666,7 @@
+@@ -6898,7 +6922,7 @@
y*|true)
usemymalloc='y'
mallocsrc='malloc.c'
d_mymalloc="$define"
case "$libs" in
*-lmalloc*)
-@@ -7286,10 +7310,10 @@
- : we will have to assume that it supports the 4.2 BSD interface
- d_oldsock="$undef"
- else
-- echo "You don't have Berkeley networking in libc.a..." >&4
-- if test -f /usr/lib/libnet.a; then
-- ( (nm $nm_opt /usr/lib/libnet.a | eval $nm_extract) || \
-- ar t /usr/lib/libnet.a) 2>/dev/null >> libc.list
-+ echo "You don't have Berkeley networking in libc$lib_ext..." >&4
-+ if test -f /usr/lib/libnet$lib_ext; then
-+ ( (nm $nm_opt /usr/lib/libnet$lib_ext | eval $nm_extract) || \
-+ $ar t /usr/lib/libnet$lib_ext) 2>/dev/null >> libc.list
- if $contains socket libc.list >/dev/null 2>&1; then
- echo "...but the Wollongong group seems to have hacked it in." >&4
- socketlib="-lnet"
-@@ -7302,7 +7326,7 @@
- d_oldsock="$define"
- fi
- else
-- echo "or even in libnet.a, which is peculiar." >&4
-+ echo "or even in libnet$lib_ext, which is peculiar." >&4
- d_socket="$undef"
- d_oldsock="$undef"
- fi
-@@ -7867,7 +7891,7 @@
+@@ -8156,7 +8180,7 @@
printf("%d\n", (char *)&try.bar - (char *)&try.foo);
}
EOCP
dflt=`./try`
else
dflt='8'
-@@ -7915,7 +7939,7 @@
+@@ -8204,7 +8228,7 @@
}
EOCP
xxx_prompt=y
dflt=`./try`
case "$dflt" in
[1-4][1-4][1-4][1-4]|12345678|87654321)
-@@ -8337,7 +8361,7 @@
- printf("%d\n",i);
- }
- EOCP
-- if $cc try.c -o try >/dev/null 2>&1 ; then
-+ if $cc $ldflags try.c -o try >/dev/null 2>&1 ; then
- dflt=`try`
- else
- dflt='?'
-@@ -8364,18 +8388,18 @@
+@@ -8711,18 +8735,18 @@
$cc $ccflags -c bar1.c >/dev/null 2>&1
$cc $ccflags -c bar2.c >/dev/null 2>&1
$cc $ccflags -c foo.c >/dev/null 2>&1
--ar rc bar.a bar2.o bar1.o >/dev/null 2>&1
--if $cc $ccflags $ldflags -o foobar foo.o bar.a $libs > /dev/null 2>&1 &&
-+$ar rc bar$lib_ext bar2$obj_ext bar1$obj_ext >/dev/null 2>&1
-+if $cc $ccflags $ldflags -o foobar foo$obj_ext bar$lib_ext $libs > /dev/null 2>&1 &&
+-ar rc bar$lib_ext bar2.o bar1.o >/dev/null 2>&1
++$ar rc bar$lib_ext bar2.o bar1.o >/dev/null 2>&1
+ if $cc $ccflags $ldflags -o foobar foo.o bar$lib_ext $libs > /dev/null 2>&1 &&
./foobar >/dev/null 2>&1; then
- echo "ar appears to generate random libraries itself."
+ echo "$ar appears to generate random libraries itself."
orderlib=false
ranlib=":"
--elif ar ts bar.a >/dev/null 2>&1 &&
-- $cc $ccflags $ldflags -o foobar foo.o bar.a $libs > /dev/null 2>&1 &&
+-elif ar ts bar$lib_ext >/dev/null 2>&1 &&
+elif $ar ts bar$lib_ext >/dev/null 2>&1 &&
-+ $cc $ccflags $ldflags -o foobar foo$obj_ext bar$lib_ext $libs > /dev/null 2>&1 &&
+ $cc $ccflags $ldflags -o foobar foo.o bar$lib_ext $libs > /dev/null 2>&1 &&
./foobar >/dev/null 2>&1; then
- echo "a table of contents needs to be added with 'ar ts'."
+- echo "a table of contents needs to be added with 'ar ts'."
++ echo "a table of contents needs to be added with '$ar ts'."
orderlib=false
- ranlib="ar ts"
+ ranlib="$ar ts"
else
case "$ranlib" in
:) ranlib='';;
-@@ -8447,7 +8471,7 @@
+@@ -8794,7 +8818,7 @@
'') $echo $n ".$c"
if $cc $ccflags \
$i_time $i_systime $i_systimek $sysselect $s_timeval $s_timezone \
set X $i_time $i_systime $i_systimek $sysselect $s_timeval
shift
flags="$*"
-@@ -8517,7 +8541,7 @@
+@@ -8863,7 +8887,7 @@
#endif
}
EOCP
d_fds_bits="$define"
d_fd_set="$define"
echo "Well, your system knows about the normal fd_set typedef..." >&4
-@@ -8534,7 +8558,7 @@
+@@ -8880,7 +8904,7 @@
$cat <<'EOM'
Hmm, your compiler has some difficulty with fd_set. Checking further...
EOM
d_fds_bits="$undef"
d_fd_set="$define"
echo "Well, your system has some sort of fd_set available..." >&4
-@@ -9272,7 +9296,7 @@
+@@ -9627,7 +9651,7 @@
else
echo "false"
fi
EOP
chmod +x varargs
-@@ -9596,7 +9620,7 @@
+@@ -9954,7 +9978,7 @@
echo " "
echo "Stripping down executable paths..." >&4
for file in $loclist $trylist; do