This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Update Plan 9, Win32, VMS configs with $shortsize and $longsize
[perl5.git] / os2 / diff.configure
CommitLineData
774d564b 1--- Configure.dist Fri Jan 24 10:22:24 1997
2+++ Configure Fri Jan 24 10:22:27 1997
3@@ -1465,7 +1465,7 @@
8566f259 4 *)
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
7- exit 1
8+ #exit 1
9 ;;
10 esac
11 done
774d564b 12@@ -1474,7 +1474,9 @@
8566f259 13 say=offhand
14 for file in $trylist; do
15 xxx=`./loc $file $file $pth`
16- eval $file=$xxx
17+ if test "X$file" != "X$xxx" ; then
18+ eval $file=$xxx
19+ fi
20 eval _$file=$xxx
21 case "$xxx" in
22 /*)
774d564b 23@@ -3161,7 +3163,7 @@
8566f259 24 exit(0);
25 }
26 EOM
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`
30 case "$gccversion" in
31 '') echo "You are not using GNU cc." ;;
774d564b 32@@ -3364,6 +3366,12 @@
8566f259 33 *"-l$thislib "*);;
34 *) dflt="$dflt -l$thislib";;
35 esac
36+ elif xxx=`./loc $thislib.lib X $libpth`; $test -f "$xxx"; then
37+ echo "Found -l$thislib."
38+ case " $dflt " in
39+ *"-l$thislib "*);;
40+ *) dflt="$dflt -l$thislib";;
41+ esac
42 else
43 echo "No -l$thislib."
44 fi
774d564b 45@@ -3912,7 +3920,7 @@
8566f259 46 esac
47 ;;
48 esac
49-libnames='';
50+#libnames='';
51 case "$libs" in
52 '') ;;
53 *) for thislib in $libs; do
774d564b 54@@ -4114,6 +4122,10 @@
8566f259 55 eval $xscan;\
56 $contains '^fprintf$' libc.list >/dev/null 2>&1; then
57 eval $xrun
58+elif com="$sed -n -e 's/^[-0-9a-f ]*_\(.*\)=.*/\1/p'";\
59+ eval $xscan;\
60+ $contains '^fprintf$' libc.list >/dev/null 2>&1; then
61+ eval $xrun
62 else
63 nm -p $* 2>/dev/null >libc.tmp
64 $grep fprintf libc.tmp > libc.ptf
774d564b 65@@ -4124,23 +4136,33 @@
8566f259 66 eval $xrun
67 else
68 echo " "
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
71 com=''
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
77+ echo \; > libc.tmp
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 \
83+ 2>/dev/null && \
84+ $sed -e 's/^\([_a-zA-Z0-9]*\) .*$/\1/p' \
85+ < tmp.imp >>libc.tmp
86+ $rm tmp.imp
87+ fi
88 done
89- $sed -e 's/\.o$//' < libc.tmp > libc.list
90+ $sed -e 's/\.o$//' -e 's/^ \+//' < libc.tmp | grep -v "^IMPORT#" > libc.list
91 echo "Ok." >&4
92 else
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
97 then
98 for thisname in $libnames; do
99 bld t $libnames | \
100 $sed -e 's/.*\///' -e 's/\.o:.*$//' >>libc.list
101- ar t $thisname >>libc.tmp
102+ $ar t $thisname >>libc.tmp
103 done
104 echo "Ok." >&4
105 else
774d564b 106@@ -5738,7 +5760,7 @@
8566f259 107 exit(0);
108 }
109 EOCP
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
112 intsize=`./try`
113 echo "Your integers are $intsize bytes long."
114 else
774d564b 115@@ -5818,7 +5840,7 @@
8566f259 116 exit(result);
117 }
118 EOCP
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
121 ./try
122 yyy=$?
123 else
774d564b 124@@ -5899,7 +5921,7 @@
8566f259 125
126 }
127 EOCP
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
130 ./try
131 castflags=$?
132 else
774d564b 133@@ -5938,7 +5960,7 @@
8566f259 134 exit((unsigned long)vsprintf(buf,"%s",args) > 10L);
135 }
136 EOF
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
140 val2="$undef"
141 else
774d564b 142@@ -6283,7 +6305,7 @@
8566f259 143 EOCP
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
148 h_sysfile=true;
149 echo "<sys/file.h> defines the O_* constants..." >&4
150 if ./open3; then
774d564b 151@@ -6294,7 +6316,7 @@
8566f259 152 val="$undef"
153 fi
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
157 h_fcntl=true;
158 echo "<fcntl.h> defines the O_* constants..." >&4
159 if ./open3; then
774d564b 160@@ -6800,7 +6822,7 @@
8566f259 161 y*|true)
162 usemymalloc='y'
163 mallocsrc='malloc.c'
164- mallocobj='malloc.o'
165+ mallocobj="malloc$obj_ext"
166 d_mymalloc="$define"
167 case "$libs" in
168 *-lmalloc*)
774d564b 169@@ -8053,7 +8075,7 @@
8566f259 170 printf("%d\n", (char *)&try.bar - (char *)&try.foo);
171 }
172 EOCP
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
175 dflt=`./try`
176 else
177 dflt='8'
774d564b 178@@ -8101,7 +8123,7 @@
8566f259 179 }
180 EOCP
181 xxx_prompt=y
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
184 dflt=`./try`
185 case "$dflt" in
186 [1-4][1-4][1-4][1-4]|12345678|87654321)
774d564b 187@@ -8523,7 +8545,7 @@
8566f259 188 printf("%d\n",i);
189 }
190 EOCP
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
193 dflt=`try`
194 else
195 dflt='?'
774d564b 196@@ -8633,7 +8655,7 @@
8566f259 197 '') $echo $n ".$c"
198 if $cc $ccflags \
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
203 shift
204 flags="$*"
774d564b 205@@ -8702,7 +8724,7 @@
8566f259 206 #endif
207 }
208 EOCP
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
211 d_fds_bits="$define"
212 d_fd_set="$define"
213 echo "Well, your system knows about the normal fd_set typedef..." >&4
774d564b 214@@ -8719,7 +8741,7 @@
8566f259 215 $cat <<'EOM'
216 Hmm, your compiler has some difficulty with fd_set. Checking further...
217 EOM
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
220 d_fds_bits="$undef"
221 d_fd_set="$define"
222 echo "Well, your system has some sort of fd_set available..." >&4
774d564b 223@@ -9458,7 +9480,7 @@
8566f259 224 else
225 echo "false"
226 fi
227-$rm -f varargs.o
228+$rm -f varargs$obj_ext
229 EOP
230 chmod +x varargs
231
774d564b 232@@ -9785,7 +9807,7 @@
8566f259 233 echo " "
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
238 done
239 ;;
240 esac