1 --- Configure.dist Fri Jan 24 10:22:24 1997
2 +++ Configure Fri Jan 24 10:22:27 1997
5 echo "I don't know where '$file' is, and my life depends on it." >&4
6 echo "Go find a public domain implementation or fix your PATH setting!" >&4
14 for file in $trylist; do
15 xxx=`./loc $file $file $pth`
17 + if test "X$file" != "X$xxx" ; then
27 -if $cc -o gccvers gccvers.c >/dev/null 2>&1; then
28 +if $cc -o gccvers gccvers.c $ldflags >/dev/null 2>&1; then
29 gccversion=`./gccvers`
31 '') echo "You are not using GNU cc." ;;
32 @@ -3364,6 +3366,12 @@
34 *) dflt="$dflt -l$thislib";;
36 + elif xxx=`./loc $thislib.lib X $libpth`; $test -f "$xxx"; then
37 + echo "Found -l$thislib."
40 + *) dflt="$dflt -l$thislib";;
53 *) for thislib in $libs; do
54 @@ -4114,6 +4122,10 @@
56 $contains '^fprintf$' libc.list >/dev/null 2>&1; then
58 +elif com="$sed -n -e 's/^[-0-9a-f ]*_\(.*\)=.*/\1/p'";\
60 + $contains '^fprintf$' libc.list >/dev/null 2>&1; then
63 nm -p $* 2>/dev/null >libc.tmp
64 $grep fprintf libc.tmp > libc.ptf
65 @@ -4124,23 +4136,33 @@
69 - echo "nm didn't seem to work right. Trying ar instead..." >&4
70 + echo "nm didn't seem to work right. Trying $ar instead..." >&4
72 - if ar t $libc > libc.tmp; then
73 - for thisname in $libnames; do
74 - ar t $thisname >>libc.tmp
75 + if test "X$osname" = "Xos2"; then ar_opt=tv ; else ar_opt=t ;fi
76 + if $ar $ar_opt $libc > libc.tmp; then
78 + for thisname in $libnames $libc; do
79 + $ar $ar_opt $thisname >>libc.tmp
80 + if test "X$osname" = "Xos2"; then
81 + # Revision 50 of EMX has bug in $ar:
82 + emximp -o tmp.imp $thisname \
84 + $sed -e 's/^\([_a-zA-Z0-9]*\) .*$/\1/p' \
85 + < tmp.imp >>libc.tmp
89 - $sed -e 's/\.o$//' < libc.tmp > libc.list
90 + $sed -e 's/\.o$//' -e 's/^ \+//' < libc.tmp | grep -v "^IMPORT#" > libc.list
93 - echo "ar didn't seem to work right." >&4
94 + echo "$ar didn't seem to work right." >&4
95 echo "Maybe this is a Cray...trying bld instead..." >&4
96 if bld t $libc | $sed -e 's/.*\///' -e 's/\.o:.*$//' > libc.list
98 for thisname in $libnames; do
100 $sed -e 's/.*\///' -e 's/\.o:.*$//' >>libc.list
101 - ar t $thisname >>libc.tmp
102 + $ar t $thisname >>libc.tmp
106 @@ -5738,7 +5760,7 @@
110 - if $cc $ccflags try.c -o try >/dev/null 2>&1 && ./try > /dev/null; then
111 + if $cc $ccflags $ldflags try.c -o try >/dev/null 2>&1 && ./try > /dev/null; then
113 echo "Your integers are $intsize bytes long."
115 @@ -5818,7 +5840,7 @@
119 -if $cc -o try $ccflags try.c >/dev/null 2>&1; then
120 +if $cc -o try $ccflags try.c $ldflags >/dev/null 2>&1; then
124 @@ -5899,7 +5921,7 @@
128 -if $cc -o try $ccflags try.c >/dev/null 2>&1; then
129 +if $cc -o try $ccflags try.c $ldflags >/dev/null 2>&1; then
133 @@ -5938,7 +5960,7 @@
134 exit((unsigned long)vsprintf(buf,"%s",args) > 10L);
137 - if $cc $ccflags vprintf.c -o vprintf >/dev/null 2>&1 && ./vprintf; then
138 + if $cc $ccflags vprintf.c $ldflags -o vprintf >/dev/null 2>&1 && ./vprintf; then
139 echo "Your vsprintf() returns (int)." >&4
142 @@ -6283,7 +6305,7 @@
144 : check sys/file.h first to get FREAD on Sun
145 if $test `./findhdr sys/file.h` && \
146 - $cc $cppflags "-DI_SYS_FILE" open3.c -o open3 >/dev/null 2>&1 ; then
147 + $cc $cppflags $ldflags "-DI_SYS_FILE" open3.c -o open3 >/dev/null 2>&1 ; then
149 echo "<sys/file.h> defines the O_* constants..." >&4
151 @@ -6294,7 +6316,7 @@
154 elif $test `./findhdr fcntl.h` && \
155 - $cc "-DI_FCNTL" open3.c -o open3 >/dev/null 2>&1 ; then
156 + $cc "-DI_FCNTL" $ldflags open3.c -o open3 >/dev/null 2>&1 ; then
158 echo "<fcntl.h> defines the O_* constants..." >&4
160 @@ -6800,7 +6822,7 @@
164 - mallocobj='malloc.o'
165 + mallocobj="malloc$obj_ext"
169 @@ -8053,7 +8075,7 @@
170 printf("%d\n", (char *)&try.bar - (char *)&try.foo);
173 - if $cc $ccflags try.c -o try >/dev/null 2>&1; then
174 + if $cc $ccflags $ldflags try.c -o try >/dev/null 2>&1; then
178 @@ -8101,7 +8123,7 @@
182 - if $cc $ccflags try.c -o try >/dev/null 2>&1 && ./try > /dev/null; then
183 + if $cc $ccflags $ldflags try.c -o try >/dev/null 2>&1 && ./try > /dev/null; then
186 [1-4][1-4][1-4][1-4]|12345678|87654321)
187 @@ -8523,7 +8545,7 @@
191 - if $cc try.c -o try >/dev/null 2>&1 ; then
192 + if $cc $ldflags try.c -o try >/dev/null 2>&1 ; then
196 @@ -8633,7 +8655,7 @@
199 $i_time $i_systime $i_systimek $sysselect $s_timeval $s_timezone \
200 - try.c -o try >/dev/null 2>&1 ; then
201 + try.c -o try $ldflags >/dev/null 2>&1 ; then
202 set X $i_time $i_systime $i_systimek $sysselect $s_timeval
205 @@ -8702,7 +8724,7 @@
209 -if $cc $ccflags -DTRYBITS fd_set.c -o fd_set >fd_set.out 2>&1 ; then
210 +if $cc $ccflags $ldflags -DTRYBITS fd_set.c -o fd_set >fd_set.out 2>&1 ; then
213 echo "Well, your system knows about the normal fd_set typedef..." >&4
214 @@ -8719,7 +8741,7 @@
216 Hmm, your compiler has some difficulty with fd_set. Checking further...
218 - if $cc $ccflags fd_set.c -o fd_set >fd_set.out 2>&1 ; then
219 + if $cc $ccflags $ldflags fd_set.c -o fd_set >fd_set.out 2>&1 ; then
222 echo "Well, your system has some sort of fd_set available..." >&4
223 @@ -9458,7 +9480,7 @@
228 +$rm -f varargs$obj_ext
232 @@ -9785,7 +9807,7 @@
234 echo "Stripping down executable paths..." >&4
235 for file in $loclist $trylist; do
236 - eval $file="\$file"
237 + if test X$file != Xln -o X$osname != Xos2; then eval $file="\$file"; fi