---- Configure.dist Fri Feb 28 10:45:27 1997
-+++ Configure Fri Feb 28 10:45:31 1997
-@@ -1481,7 +1481,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
-- exit 1
-+ #exit 1
- ;;
- esac
- done
-@@ -1490,7 +1490,9 @@
- say=offhand
- for file in $trylist; do
- xxx=`./loc $file $file $pth`
-- eval $file=$xxx
-+ if test "X$file" != "X$xxx" ; then
-+ eval $file=$xxx
-+ fi
- eval _$file=$xxx
- case "$xxx" in
- /*)
-@@ -3178,7 +3180,7 @@
- exit(0);
- }
- EOM
--if $cc -o gccvers gccvers.c >/dev/null 2>&1; then
-+if $cc -o gccvers gccvers.c $ldflags >/dev/null 2>&1; then
- gccversion=`./gccvers`
- case "$gccversion" in
- '') echo "You are not using GNU cc." ;;
-@@ -3381,6 +3383,12 @@
- *"-l$thislib "*);;
- *) dflt="$dflt -l$thislib";;
- esac
-+ elif xxx=`./loc $thislib.lib X $libpth`; $test -f "$xxx"; then
-+ echo "Found -l$thislib."
-+ case " $dflt " in
-+ *"-l$thislib "*);;
-+ *) dflt="$dflt -l$thislib";;
-+ esac
- else
- echo "No -l$thislib."
- fi
-@@ -3930,7 +3938,7 @@
- esac
- ;;
- esac
--libnames='';
-+#libnames='';
- case "$libs" in
- '') ;;
- *) for thislib in $libs; do
-@@ -4136,6 +4144,10 @@
- eval $xscan;\
- $contains '^fprintf$' libc.list >/dev/null 2>&1; then
- eval $xrun
-+elif com="$sed -n -e 's/^[-0-9a-f ]*_\(.*\)=.*/\1/p'";\
-+ 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
-@@ -4146,23 +4158,33 @@
- eval $xrun
- else
- echo " "
-- echo "nm didn't seem to work right. Trying ar instead..." >&4
-+ echo "nm didn't seem to work right. Trying $ar instead..." >&4
- com=''
-- if ar t $libc > libc.tmp; then
-- for thisname in $libnames; do
-- ar t $thisname >>libc.tmp
-+ if test "X$osname" = "Xos2"; then ar_opt=tv ; else ar_opt=t ;fi
-+ if $ar $ar_opt $libc > libc.tmp; then
-+ echo \; > libc.tmp
-+ for thisname in $libnames $libc; do
-+ $ar $ar_opt $thisname >>libc.tmp
-+ if test "X$osname" = "Xos2"; then
-+ # Revision 50 of EMX has bug in $ar:
-+ emximp -o tmp.imp $thisname \
-+ 2>/dev/null && \
-+ $sed -e 's/^\([_a-zA-Z0-9]*\) .*$/\1/p' \
-+ < tmp.imp >>libc.tmp
-+ $rm tmp.imp
-+ fi
- done
-- $sed -e 's/\.o$//' < libc.tmp > libc.list
-+ $sed -e 's/\.o$//' -e 's/^ \+//' < libc.tmp | grep -v "^IMPORT#" > libc.list
- echo "Ok." >&4
- else
-- echo "ar didn't seem to work right." >&4
-+ echo "$ar didn't seem to work right." >&4
- echo "Maybe this is a Cray...trying bld instead..." >&4
- if bld t $libc | $sed -e 's/.*\///' -e 's/\.o:.*$//' > libc.list
- then
- for thisname in $libnames; do
- bld t $libnames | \
- $sed -e 's/.*\///' -e 's/\.o:.*$//' >>libc.list
-- ar t $thisname >>libc.tmp
-+ $ar t $thisname >>libc.tmp
- done
- echo "Ok." >&4
- else
-@@ -5871,7 +5893,7 @@
- exit(result);
- }
- EOCP
--if $cc -o try $ccflags try.c >/dev/null 2>&1; then
-+if $cc -o try $ccflags try.c $ldflags >/dev/null 2>&1; then
- ./try
- yyy=$?
- else
-@@ -5952,7 +5974,7 @@
-
- }
- EOCP
--if $cc -o try $ccflags try.c >/dev/null 2>&1; then
-+if $cc -o try $ccflags try.c $ldflags >/dev/null 2>&1; then
- ./try
- castflags=$?
- else
-@@ -5991,7 +6013,7 @@
- exit((unsigned long)vsprintf(buf,"%s",args) > 10L);
- }
- EOF
-- if $cc $ccflags vprintf.c -o vprintf >/dev/null 2>&1 && ./vprintf; then
-+ if $cc $ccflags vprintf.c $ldflags -o vprintf >/dev/null 2>&1 && ./vprintf; then
- echo "Your vsprintf() returns (int)." >&4
- val2="$undef"
- else
-@@ -6336,7 +6358,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
- h_sysfile=true;
- echo "<sys/file.h> defines the O_* constants..." >&4
- if ./open3; then
-@@ -6347,7 +6369,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
- h_fcntl=true;
- echo "<fcntl.h> defines the O_* constants..." >&4
- if ./open3; then
-@@ -6853,7 +6875,7 @@
- y*|true)
- usemymalloc='y'
- mallocsrc='malloc.c'
-- mallocobj='malloc.o'
-+ mallocobj="malloc$obj_ext"
- d_mymalloc="$define"
- case "$libs" in
- *-lmalloc*)
-@@ -8111,7 +8133,7 @@
- printf("%d\n", (char *)&try.bar - (char *)&try.foo);
- }
- EOCP
-- if $cc $ccflags try.c -o try >/dev/null 2>&1; then
-+ if $cc $ccflags $ldflags try.c -o try >/dev/null 2>&1; then
- dflt=`./try`
- else
- dflt='8'
-@@ -8159,7 +8181,7 @@
- }
- EOCP
- xxx_prompt=y
-- 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
- dflt=`./try`
- case "$dflt" in
- [1-4][1-4][1-4][1-4]|12345678|87654321)
-@@ -8692,7 +8714,7 @@
- '') $echo $n ".$c"
- if $cc $ccflags \
- $i_time $i_systime $i_systimek $sysselect $s_timeval $s_timezone \
-- try.c -o try >/dev/null 2>&1 ; then
-+ try.c -o try $ldflags >/dev/null 2>&1 ; then
- set X $i_time $i_systime $i_systimek $sysselect $s_timeval
- shift
- flags="$*"
-@@ -8761,7 +8783,7 @@
- #endif
- }
- EOCP
--if $cc $ccflags -DTRYBITS fd_set.c -o fd_set >fd_set.out 2>&1 ; then
-+if $cc $ccflags $ldflags -DTRYBITS fd_set.c -o fd_set >fd_set.out 2>&1 ; then
- d_fds_bits="$define"
- d_fd_set="$define"
- echo "Well, your system knows about the normal fd_set typedef..." >&4
-@@ -8778,7 +8800,7 @@
- $cat <<'EOM'
- Hmm, your compiler has some difficulty with fd_set. Checking further...
- EOM
-- if $cc $ccflags fd_set.c -o fd_set >fd_set.out 2>&1 ; then
-+ if $cc $ccflags $ldflags fd_set.c -o fd_set >fd_set.out 2>&1 ; then
- d_fds_bits="$undef"
- d_fd_set="$define"
- echo "Well, your system has some sort of fd_set available..." >&4
-@@ -9525,7 +9547,7 @@
- else
- echo "false"
- fi
--$rm -f varargs.o
-+$rm -f varargs$obj_ext
- EOP
- chmod +x varargs
-
-@@ -9852,7 +9874,7 @@
- echo " "
- echo "Stripping down executable paths..." >&4
- for file in $loclist $trylist; do
-- eval $file="\$file"
-+ if test X$file != Xln -o X$osname != Xos2; then eval $file="\$file"; fi
- done
- ;;
- esac
https://perl5.git.perl.org / perl5.git / blobdiff