source: patches/2.0/vim-7.0-cross_compile-1.patch@ e6321b3

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since e6321b3 was e9be59d, checked in by Jim Gifford <clfs@…>, 18 years ago

r3849@server (orig r1736): jciccone | 2006-06-06 17:35:53 -0700
Added the vim cross compilation patch.
  • Property mode set to 100644
File size: 24.1 KB
RevLine 
[e9be59d]1Submitted By: Joe Ciccone <joeciccone@crazyeyesoft.com
2Date: 2006-06-06
3Initial Package Version: 7.0
4Upstream Status: Unknown
5Origin: Joe Ciccone and OpenEmbedded
6Description: This patch makes it possible to cross_compile vim.
7
8diff -Naur vim70.orig/src/auto/configure vim70/src/auto/configure
9--- vim70.orig/src/auto/configure 2006-06-06 16:19:58.000000000 -0400
10+++ vim70/src/auto/configure 2006-06-06 16:49:08.000000000 -0400
11@@ -2796,14 +2796,6 @@
12 fi
13 fi
14
15-if test "$cross_compiling" = yes; then
16- { { echo "$as_me:$LINENO: error: cannot compile a simple program, check CC and CFLAGS
17- (cross compiling doesn't work)" >&5
18-echo "$as_me: error: cannot compile a simple program, check CC and CFLAGS
19- (cross compiling doesn't work)" >&2;}
20- { (exit 1); exit 1; }; }
21-fi
22-
23 test "$GCC" = yes && CPP_MM=M;
24
25 if test -f ./toolcheck; then
26@@ -3410,27 +3402,6 @@
27
28
29
30-have_local_include=''
31-have_local_lib=''
32-if test "$GCC" = yes; then
33- echo 'void f(){}' > conftest.c
34- have_local_include=`${CC-cc} -no-cpp-precomp -c -v conftest.c 2>&1 | grep '/usr/local/include'`
35- have_local_lib=`${CC-cc} -c -v conftest.c 2>&1 | grep '/usr/local/lib'`
36- rm -f conftest.c conftest.o
37-fi
38-if test -z "$have_local_lib" -a -d /usr/local/lib; then
39- tt=`echo "$LDFLAGS" | sed -e 's+-L/usr/local/lib ++g' -e 's+-L/usr/local/lib$++g'`
40- if test "$tt" = "$LDFLAGS"; then
41- LDFLAGS="$LDFLAGS -L/usr/local/lib"
42- fi
43-fi
44-if test -z "$have_local_include" -a -d /usr/local/include; then
45- tt=`echo "$CPPFLAGS" | sed -e 's+-I/usr/local/include ++g' -e 's+-I/usr/local/include$++g'`
46- if test "$tt" = "$CPPFLAGS"; then
47- CPPFLAGS="$CPPFLAGS -I/usr/local/include"
48- fi
49-fi
50-
51 echo "$as_me:$LINENO: checking --with-vim-name argument" >&5
52 echo $ECHO_N "checking --with-vim-name argument... $ECHO_C" >&6
53
54@@ -9273,9 +9244,8 @@
55 echo "$as_me:$LINENO: checking quality of toupper" >&5
56 echo $ECHO_N "checking quality of toupper... $ECHO_C" >&6
57 if test "$cross_compiling" = yes; then
58- { { echo "$as_me:$LINENO: error: failed to compile test program" >&5
59-echo "$as_me: error: failed to compile test program" >&2;}
60- { (exit 1); exit 1; }; }
61+ { echo "$as_me:$LINENO: WARNING: failed to compile test program" >&5
62+echo "$as_me: WARNING: failed to compile test program" >&2;}
63 else
64 cat >conftest.$ac_ext <<_ACEOF
65 /* confdefs.h. */
66@@ -11748,9 +11718,12 @@
67 echo "$as_me:$LINENO: checking whether we talk terminfo" >&5
68 echo $ECHO_N "checking whether we talk terminfo... $ECHO_C" >&6
69 if test "$cross_compiling" = yes; then
70- { { echo "$as_me:$LINENO: error: failed to compile test program." >&5
71-echo "$as_me: error: failed to compile test program." >&2;}
72- { (exit 1); exit 1; }; }
73+ { echo "$as_me:$LINENO: WARNING: failed to compile test program." >&5
74+echo "$as_me: WARNING: failed to compile test program." >&2;}
75+ cat >>confdefs.h <<\_ACEOF
76+#define TERMINFO 1
77+_ACEOF
78+
79 else
80 cat >conftest.$ac_ext <<_ACEOF
81 /* confdefs.h. */
82@@ -12313,9 +12286,8 @@
83 echo $ECHO_N "checking default tty permissions/group... $ECHO_C" >&6
84 rm -f conftest_grp
85 if test "$cross_compiling" = yes; then
86- { { echo "$as_me:$LINENO: error: failed to compile test program" >&5
87-echo "$as_me: error: failed to compile test program" >&2;}
88- { (exit 1); exit 1; }; }
89+ { echo "$as_me:$LINENO: WARNING: failed to compile test program" >&5
90+echo "$as_me: WARNING: failed to compile test program" >&2;}
91 else
92 cat >conftest.$ac_ext <<_ACEOF
93 /* confdefs.h. */
94@@ -12542,9 +12514,8 @@
95 echo "$as_me:$LINENO: checking getcwd implementation" >&5
96 echo $ECHO_N "checking getcwd implementation... $ECHO_C" >&6
97 if test "$cross_compiling" = yes; then
98- { { echo "$as_me:$LINENO: error: failed to compile test program" >&5
99-echo "$as_me: error: failed to compile test program" >&2;}
100- { (exit 1); exit 1; }; }
101+ { echo "$as_me:$LINENO: WARNING: failed to compile test program" >&5
102+echo "$as_me: WARNING: failed to compile test program" >&2;}
103 else
104 cat >conftest.$ac_ext <<_ACEOF
105 /* confdefs.h. */
106@@ -12805,10 +12776,12 @@
107
108 echo "$as_me:$LINENO: checking whether stat() ignores a trailing slash" >&5
109 echo $ECHO_N "checking whether stat() ignores a trailing slash... $ECHO_C" >&6
110-if test "$cross_compiling" = yes; then
111- { { echo "$as_me:$LINENO: error: failed to compile test program" >&5
112-echo "$as_me: error: failed to compile test program" >&2;}
113- { (exit 1); exit 1; }; }
114+if test "${ac_cv_func_stat_ignores_trailing_slash+set}" = set; then
115+ echo $ECHO_N "(cached) $ECHO_C" >&6
116+else
117+ if test "$cross_compiling" = yes; then
118+ ac_cv_func_stat_ignores_trailing_slash=no
119+
120 else
121 cat >conftest.$ac_ext <<_ACEOF
122 /* confdefs.h. */
123@@ -12831,22 +12804,27 @@
124 ac_status=$?
125 echo "$as_me:$LINENO: \$? = $ac_status" >&5
126 (exit $ac_status); }; }; then
127- echo "$as_me:$LINENO: result: yes" >&5
128-echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF
129-#define STAT_IGNORES_SLASH 1
130-_ACEOF
131-
132+ ac_cv_func_stat_ignores_trailing_slash=yes
133 else
134 echo "$as_me: program exited with status $ac_status" >&5
135 echo "$as_me: failed program was:" >&5
136 sed 's/^/| /' conftest.$ac_ext >&5
137
138 ( exit $ac_status )
139-echo "$as_me:$LINENO: result: no" >&5
140-echo "${ECHO_T}no" >&6
141+ac_cv_func_stat_ignores_trailing_slash=no
142 fi
143 rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
144 fi
145+fi
146+echo "$as_me:$LINENO: result: $ac_cv_func_stat_ignores_trailing_slash" >&5
147+echo "${ECHO_T}$ac_cv_func_stat_ignores_trailing_slash" >&6
148+
149+if X"$ac_cv_func_stat_ignores_trailing_slash" = Xyes; then
150+ cat >>confdefs.h <<\_ACEOF
151+#define STAT_IGNORES_SLASH 1
152+_ACEOF
153+
154+fi
155
156 echo "$as_me:$LINENO: checking for iconv_open()" >&5
157 echo $ECHO_N "checking for iconv_open()... $ECHO_C" >&6
158@@ -13743,15 +13721,341 @@
159 fi
160 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
161
162+echo "$as_me:$LINENO: checking for int" >&5
163+echo $ECHO_N "checking for int... $ECHO_C" >&6
164+if test "${ac_cv_type_int+set}" = set; then
165+ echo $ECHO_N "(cached) $ECHO_C" >&6
166+else
167+ cat >conftest.$ac_ext <<_ACEOF
168+/* confdefs.h. */
169+_ACEOF
170+cat confdefs.h >>conftest.$ac_ext
171+cat >>conftest.$ac_ext <<_ACEOF
172+/* end confdefs.h. */
173+$ac_includes_default
174+int
175+main ()
176+{
177+if ((int *) 0)
178+ return 0;
179+if (sizeof (int))
180+ return 0;
181+ ;
182+ return 0;
183+}
184+_ACEOF
185+rm -f conftest.$ac_objext
186+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
187+ (eval $ac_compile) 2>conftest.er1
188+ ac_status=$?
189+ grep -v '^ *+' conftest.er1 >conftest.err
190+ rm -f conftest.er1
191+ cat conftest.err >&5
192+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
193+ (exit $ac_status); } &&
194+ { ac_try='test -z "$ac_c_werror_flag"
195+ || test ! -s conftest.err'
196+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
197+ (eval $ac_try) 2>&5
198+ ac_status=$?
199+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
200+ (exit $ac_status); }; } &&
201+ { ac_try='test -s conftest.$ac_objext'
202+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
203+ (eval $ac_try) 2>&5
204+ ac_status=$?
205+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
206+ (exit $ac_status); }; }; then
207+ ac_cv_type_int=yes
208+else
209+ echo "$as_me: failed program was:" >&5
210+sed 's/^/| /' conftest.$ac_ext >&5
211+
212+ac_cv_type_int=no
213+fi
214+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
215+fi
216+echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
217+echo "${ECHO_T}$ac_cv_type_int" >&6
218
219 echo "$as_me:$LINENO: checking size of int" >&5
220 echo $ECHO_N "checking size of int... $ECHO_C" >&6
221 if test "${ac_cv_sizeof_int+set}" = set; then
222 echo $ECHO_N "(cached) $ECHO_C" >&6
223 else
224+ if test "$ac_cv_type_int" = yes; then
225+ # The cast to unsigned long works around a bug in the HP C Compiler
226+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
227+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
228+ # This bug is HP SR number 8606223364.
229 if test "$cross_compiling" = yes; then
230- { { echo "$as_me:$LINENO: error: failed to compile test program" >&5
231-echo "$as_me: error: failed to compile test program" >&2;}
232+ # Depending upon the size, compute the lo and hi bounds.
233+cat >conftest.$ac_ext <<_ACEOF
234+/* confdefs.h. */
235+_ACEOF
236+cat confdefs.h >>conftest.$ac_ext
237+cat >>conftest.$ac_ext <<_ACEOF
238+/* end confdefs.h. */
239+$ac_includes_default
240+int
241+main ()
242+{
243+static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
244+test_array [0] = 0
245+
246+ ;
247+ return 0;
248+}
249+_ACEOF
250+rm -f conftest.$ac_objext
251+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
252+ (eval $ac_compile) 2>conftest.er1
253+ ac_status=$?
254+ grep -v '^ *+' conftest.er1 >conftest.err
255+ rm -f conftest.er1
256+ cat conftest.err >&5
257+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
258+ (exit $ac_status); } &&
259+ { ac_try='test -z "$ac_c_werror_flag"
260+ || test ! -s conftest.err'
261+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
262+ (eval $ac_try) 2>&5
263+ ac_status=$?
264+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
265+ (exit $ac_status); }; } &&
266+ { ac_try='test -s conftest.$ac_objext'
267+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
268+ (eval $ac_try) 2>&5
269+ ac_status=$?
270+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
271+ (exit $ac_status); }; }; then
272+ ac_lo=0 ac_mid=0
273+ while :; do
274+ cat >conftest.$ac_ext <<_ACEOF
275+/* confdefs.h. */
276+_ACEOF
277+cat confdefs.h >>conftest.$ac_ext
278+cat >>conftest.$ac_ext <<_ACEOF
279+/* end confdefs.h. */
280+$ac_includes_default
281+int
282+main ()
283+{
284+static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
285+test_array [0] = 0
286+
287+ ;
288+ return 0;
289+}
290+_ACEOF
291+rm -f conftest.$ac_objext
292+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
293+ (eval $ac_compile) 2>conftest.er1
294+ ac_status=$?
295+ grep -v '^ *+' conftest.er1 >conftest.err
296+ rm -f conftest.er1
297+ cat conftest.err >&5
298+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
299+ (exit $ac_status); } &&
300+ { ac_try='test -z "$ac_c_werror_flag"
301+ || test ! -s conftest.err'
302+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
303+ (eval $ac_try) 2>&5
304+ ac_status=$?
305+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
306+ (exit $ac_status); }; } &&
307+ { ac_try='test -s conftest.$ac_objext'
308+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
309+ (eval $ac_try) 2>&5
310+ ac_status=$?
311+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
312+ (exit $ac_status); }; }; then
313+ ac_hi=$ac_mid; break
314+else
315+ echo "$as_me: failed program was:" >&5
316+sed 's/^/| /' conftest.$ac_ext >&5
317+
318+ac_lo=`expr $ac_mid + 1`
319+ if test $ac_lo -le $ac_mid; then
320+ ac_lo= ac_hi=
321+ break
322+ fi
323+ ac_mid=`expr 2 '*' $ac_mid + 1`
324+fi
325+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
326+ done
327+else
328+ echo "$as_me: failed program was:" >&5
329+sed 's/^/| /' conftest.$ac_ext >&5
330+
331+cat >conftest.$ac_ext <<_ACEOF
332+/* confdefs.h. */
333+_ACEOF
334+cat confdefs.h >>conftest.$ac_ext
335+cat >>conftest.$ac_ext <<_ACEOF
336+/* end confdefs.h. */
337+$ac_includes_default
338+int
339+main ()
340+{
341+static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
342+test_array [0] = 0
343+
344+ ;
345+ return 0;
346+}
347+_ACEOF
348+rm -f conftest.$ac_objext
349+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
350+ (eval $ac_compile) 2>conftest.er1
351+ ac_status=$?
352+ grep -v '^ *+' conftest.er1 >conftest.err
353+ rm -f conftest.er1
354+ cat conftest.err >&5
355+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
356+ (exit $ac_status); } &&
357+ { ac_try='test -z "$ac_c_werror_flag"
358+ || test ! -s conftest.err'
359+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
360+ (eval $ac_try) 2>&5
361+ ac_status=$?
362+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
363+ (exit $ac_status); }; } &&
364+ { ac_try='test -s conftest.$ac_objext'
365+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
366+ (eval $ac_try) 2>&5
367+ ac_status=$?
368+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
369+ (exit $ac_status); }; }; then
370+ ac_hi=-1 ac_mid=-1
371+ while :; do
372+ cat >conftest.$ac_ext <<_ACEOF
373+/* confdefs.h. */
374+_ACEOF
375+cat confdefs.h >>conftest.$ac_ext
376+cat >>conftest.$ac_ext <<_ACEOF
377+/* end confdefs.h. */
378+$ac_includes_default
379+int
380+main ()
381+{
382+static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
383+test_array [0] = 0
384+
385+ ;
386+ return 0;
387+}
388+_ACEOF
389+rm -f conftest.$ac_objext
390+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
391+ (eval $ac_compile) 2>conftest.er1
392+ ac_status=$?
393+ grep -v '^ *+' conftest.er1 >conftest.err
394+ rm -f conftest.er1
395+ cat conftest.err >&5
396+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
397+ (exit $ac_status); } &&
398+ { ac_try='test -z "$ac_c_werror_flag"
399+ || test ! -s conftest.err'
400+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
401+ (eval $ac_try) 2>&5
402+ ac_status=$?
403+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
404+ (exit $ac_status); }; } &&
405+ { ac_try='test -s conftest.$ac_objext'
406+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
407+ (eval $ac_try) 2>&5
408+ ac_status=$?
409+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
410+ (exit $ac_status); }; }; then
411+ ac_lo=$ac_mid; break
412+else
413+ echo "$as_me: failed program was:" >&5
414+sed 's/^/| /' conftest.$ac_ext >&5
415+
416+ac_hi=`expr '(' $ac_mid ')' - 1`
417+ if test $ac_mid -le $ac_hi; then
418+ ac_lo= ac_hi=
419+ break
420+ fi
421+ ac_mid=`expr 2 '*' $ac_mid`
422+fi
423+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
424+ done
425+else
426+ echo "$as_me: failed program was:" >&5
427+sed 's/^/| /' conftest.$ac_ext >&5
428+
429+ac_lo= ac_hi=
430+fi
431+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
432+fi
433+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
434+# Binary search between lo and hi bounds.
435+while test "x$ac_lo" != "x$ac_hi"; do
436+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
437+ cat >conftest.$ac_ext <<_ACEOF
438+/* confdefs.h. */
439+_ACEOF
440+cat confdefs.h >>conftest.$ac_ext
441+cat >>conftest.$ac_ext <<_ACEOF
442+/* end confdefs.h. */
443+$ac_includes_default
444+int
445+main ()
446+{
447+static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
448+test_array [0] = 0
449+
450+ ;
451+ return 0;
452+}
453+_ACEOF
454+rm -f conftest.$ac_objext
455+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
456+ (eval $ac_compile) 2>conftest.er1
457+ ac_status=$?
458+ grep -v '^ *+' conftest.er1 >conftest.err
459+ rm -f conftest.er1
460+ cat conftest.err >&5
461+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
462+ (exit $ac_status); } &&
463+ { ac_try='test -z "$ac_c_werror_flag"
464+ || test ! -s conftest.err'
465+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
466+ (eval $ac_try) 2>&5
467+ ac_status=$?
468+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
469+ (exit $ac_status); }; } &&
470+ { ac_try='test -s conftest.$ac_objext'
471+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
472+ (eval $ac_try) 2>&5
473+ ac_status=$?
474+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
475+ (exit $ac_status); }; }; then
476+ ac_hi=$ac_mid
477+else
478+ echo "$as_me: failed program was:" >&5
479+sed 's/^/| /' conftest.$ac_ext >&5
480+
481+ac_lo=`expr '(' $ac_mid ')' + 1`
482+fi
483+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
484+done
485+case $ac_lo in
486+?*) ac_cv_sizeof_int=$ac_lo;;
487+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
488+See \`config.log' for more details." >&5
489+echo "$as_me: error: cannot compute sizeof (int), 77
490+See \`config.log' for more details." >&2;}
491+ { (exit 1); exit 1; }; } ;;
492+esac
493+else
494+ if test "$cross_compiling" = yes; then
495+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
496+See \`config.log' for more details." >&5
497+echo "$as_me: error: cannot run test program while cross compiling
498+See \`config.log' for more details." >&2;}
499 { (exit 1); exit 1; }; }
500 else
501 cat >conftest.$ac_ext <<_ACEOF
502@@ -13760,14 +14064,37 @@
503 cat confdefs.h >>conftest.$ac_ext
504 cat >>conftest.$ac_ext <<_ACEOF
505 /* end confdefs.h. */
506+$ac_includes_default
507+long longval () { return (long) (sizeof (int)); }
508+unsigned long ulongval () { return (long) (sizeof (int)); }
509 #include <stdio.h>
510- main()
511- {
512- FILE *f=fopen("conftestval", "w");
513- if (!f) exit(1);
514- fprintf(f, "%d\n", (int)sizeof(int));
515- exit(0);
516- }
517+#include <stdlib.h>
518+int
519+main ()
520+{
521+
522+ FILE *f = fopen ("conftest.val", "w");
523+ if (! f)
524+ exit (1);
525+ if (((long) (sizeof (int))) < 0)
526+ {
527+ long i = longval ();
528+ if (i != ((long) (sizeof (int))))
529+ exit (1);
530+ fprintf (f, "%ld\n", i);
531+ }
532+ else
533+ {
534+ unsigned long i = ulongval ();
535+ if (i != ((long) (sizeof (int))))
536+ exit (1);
537+ fprintf (f, "%lu\n", i);
538+ }
539+ exit (ferror (f) || fclose (f) != 0);
540+
541+ ;
542+ return 0;
543+}
544 _ACEOF
545 rm -f conftest$ac_exeext
546 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
547@@ -13780,19 +14107,27 @@
548 ac_status=$?
549 echo "$as_me:$LINENO: \$? = $ac_status" >&5
550 (exit $ac_status); }; }; then
551- ac_cv_sizeof_int=`cat conftestval`
552+ ac_cv_sizeof_int=`cat conftest.val`
553 else
554 echo "$as_me: program exited with status $ac_status" >&5
555 echo "$as_me: failed program was:" >&5
556 sed 's/^/| /' conftest.$ac_ext >&5
557
558 ( exit $ac_status )
559-ac_cv_sizeof_int=0
560+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
561+See \`config.log' for more details." >&5
562+echo "$as_me: error: cannot compute sizeof (int), 77
563+See \`config.log' for more details." >&2;}
564+ { (exit 1); exit 1; }; }
565 fi
566 rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
567 fi
568 fi
569-
570+rm -f conftest.val
571+else
572+ ac_cv_sizeof_int=0
573+fi
574+fi
575 echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
576 echo "${ECHO_T}$ac_cv_sizeof_int" >&6
577 cat >>confdefs.h <<_ACEOF
578@@ -13800,6 +14135,7 @@
579 _ACEOF
580
581
582+
583 echo "$as_me:$LINENO: checking whether memmove/bcopy/memcpy handle overlaps" >&5
584 echo $ECHO_N "checking whether memmove/bcopy/memcpy handle overlaps... $ECHO_C" >&6
585 bcopy_test_prog='
586@@ -13818,9 +14154,8 @@
587
588
589 if test "$cross_compiling" = yes; then
590- { { echo "$as_me:$LINENO: error: failed to compile test program" >&5
591-echo "$as_me: error: failed to compile test program" >&2;}
592- { (exit 1); exit 1; }; }
593+ { echo "$as_me:$LINENO: WARNING: failed to compile test program" >&5
594+echo "$as_me: WARNING: failed to compile test program" >&2;}
595 else
596 cat >conftest.$ac_ext <<_ACEOF
597 /* confdefs.h. */
598@@ -13853,9 +14188,8 @@
599
600 ( exit $ac_status )
601 if test "$cross_compiling" = yes; then
602- { { echo "$as_me:$LINENO: error: failed to compile test program" >&5
603-echo "$as_me: error: failed to compile test program" >&2;}
604- { (exit 1); exit 1; }; }
605+ { echo "$as_me:$LINENO: WARNING: failed to compile test program" >&5
606+echo "$as_me: WARNING: failed to compile test program" >&2;}
607 else
608 cat >conftest.$ac_ext <<_ACEOF
609 /* confdefs.h. */
610@@ -13888,9 +14222,8 @@
611
612 ( exit $ac_status )
613 if test "$cross_compiling" = yes; then
614- { { echo "$as_me:$LINENO: error: failed to compile test program" >&5
615-echo "$as_me: error: failed to compile test program" >&2;}
616- { (exit 1); exit 1; }; }
617+ { echo "$as_me:$LINENO: WARNING: failed to compile test program" >&5
618+echo "$as_me: WARNING: failed to compile test program" >&2;}
619 else
620 cat >conftest.$ac_ext <<_ACEOF
621 /* confdefs.h. */
622diff -Naur vim70.orig/src/configure.in vim70/src/configure.in
623--- vim70.orig/src/configure.in 2006-06-06 16:19:58.000000000 -0400
624+++ vim70/src/configure.in 2006-06-06 16:49:04.000000000 -0400
625@@ -47,13 +47,6 @@
626 fi
627 fi
628
629-dnl If configure thinks we are cross compiling, there is probably something
630-dnl wrong with the CC or CFLAGS settings, give an understandable error message
631-if test "$cross_compiling" = yes; then
632- AC_MSG_ERROR([cannot compile a simple program, check CC and CFLAGS
633- (cross compiling doesn't work)])
634-fi
635-
636 dnl gcc-cpp has the wonderful -MM option to produce nicer dependencies.
637 dnl But gcc 3.1 changed the meaning! See near the end.
638 test "$GCC" = yes && CPP_MM=M; AC_SUBST(CPP_MM)
639@@ -183,31 +176,6 @@
640 AC_SUBST(OS_EXTRA_SRC)
641 AC_SUBST(OS_EXTRA_OBJ)
642
643-dnl Add /usr/local/lib to $LDFLAGS and /usr/local/include to CFLAGS.
644-dnl Only when the directory exists and it wasn't there yet.
645-dnl For gcc don't do this when it is already in the default search path.
646-have_local_include=''
647-have_local_lib=''
648-if test "$GCC" = yes; then
649- echo 'void f(){}' > conftest.c
650- dnl -no-cpp-precomp is needed for OS X 10.2 (Ben Fowler)
651- have_local_include=`${CC-cc} -no-cpp-precomp -c -v conftest.c 2>&1 | grep '/usr/local/include'`
652- have_local_lib=`${CC-cc} -c -v conftest.c 2>&1 | grep '/usr/local/lib'`
653- rm -f conftest.c conftest.o
654-fi
655-if test -z "$have_local_lib" -a -d /usr/local/lib; then
656- tt=`echo "$LDFLAGS" | sed -e 's+-L/usr/local/lib ++g' -e 's+-L/usr/local/lib$++g'`
657- if test "$tt" = "$LDFLAGS"; then
658- LDFLAGS="$LDFLAGS -L/usr/local/lib"
659- fi
660-fi
661-if test -z "$have_local_include" -a -d /usr/local/include; then
662- tt=`echo "$CPPFLAGS" | sed -e 's+-I/usr/local/include ++g' -e 's+-I/usr/local/include$++g'`
663- if test "$tt" = "$CPPFLAGS"; then
664- CPPFLAGS="$CPPFLAGS -I/usr/local/include"
665- fi
666-fi
667-
668 AC_MSG_CHECKING(--with-vim-name argument)
669 AC_ARG_WITH(vim-name, [ --with-vim-name=NAME what to call the Vim executable],
670 VIMNAME="$withval"; AC_MSG_RESULT($VIMNAME),
671@@ -1977,7 +1945,7 @@
672 AC_TRY_RUN([#include <ctype.h>
673 main() { exit(toupper('A') == 'A' && tolower('z') == 'z'); }],
674 AC_DEFINE(BROKEN_TOUPPER) AC_MSG_RESULT(bad),
675- AC_MSG_RESULT(good), AC_MSG_ERROR(failed to compile test program))
676+ AC_MSG_RESULT(good), AC_MSG_WARN(failed to compile test program))
677
678 AC_MSG_CHECKING(whether __DATE__ and __TIME__ work)
679 AC_TRY_COMPILE(, [printf("(" __DATE__ " " __TIME__ ")");],
680@@ -2197,7 +2165,8 @@
681 {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(!strcmp(s==0 ? "" : s, "1")); }],
682 AC_MSG_RESULT([no -- we are in termcap land]),
683 AC_MSG_RESULT([yes -- terminfo spoken here]); AC_DEFINE(TERMINFO),
684- AC_MSG_ERROR(failed to compile test program.))
685+ AC_MSG_WARN(failed to compile test program.)
686+ AC_DEFINE(TERMINFO))
687
688 if test "x$olibs" != "x$LIBS"; then
689 AC_MSG_CHECKING(what tgetent() returns for an unknown terminal)
690@@ -2360,7 +2329,7 @@
691 fi
692 ],
693 AC_MSG_RESULT([can't determine - assume ptys are world accessable]),
694- AC_MSG_ERROR(failed to compile test program))
695+ AC_MSG_WARN(failed to compile test program))
696 rm -f conftest_grp
697
698 dnl Checks for library functions. ===================================
699@@ -2403,7 +2372,7 @@
700 AC_MSG_RESULT(it is usable),
701 AC_MSG_RESULT(it stinks)
702 AC_DEFINE(BAD_GETCWD),
703- AC_MSG_ERROR(failed to compile test program))
704+ AC_MSG_WARN(failed to compile test program))
705
706 dnl Check for functions in one big call, to reduce the size of configure
707 AC_CHECK_FUNCS(bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \
708@@ -2427,13 +2396,20 @@
709 AC_MSG_RESULT(yes); AC_DEFINE(HAVE_ST_BLKSIZE),
710 AC_MSG_RESULT(no))
711
712-AC_MSG_CHECKING(whether stat() ignores a trailing slash)
713+AC_CACHE_CHECK([whether stat() ignores a trailing slash],
714+ [ac_cv_func_stat_ignores_trailing_slash],
715 AC_TRY_RUN(
716 [#include <sys/types.h>
717 #include <sys/stat.h>
718 main() {struct stat st; exit(stat("configure/", &st) != 0); }],
719- AC_MSG_RESULT(yes); AC_DEFINE(STAT_IGNORES_SLASH),
720- AC_MSG_RESULT(no), AC_MSG_ERROR(failed to compile test program))
721+ ac_cv_func_stat_ignores_trailing_slash=yes,
722+ ac_cv_func_stat_ignores_trailing_slash=no,
723+ ac_cv_func_stat_ignores_trailing_slash=no
724+))
725+
726+if X"$ac_cv_func_stat_ignores_trailing_slash" = Xyes; then
727+ AC_DEFINE(STAT_IGNORES_SLASH)
728+fi
729
730 dnl Link with iconv for charset translation, if not found without library.
731 dnl check for iconv() requires including iconv.h
732@@ -2597,24 +2573,7 @@
733 AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SYSCONF),
734 AC_MSG_RESULT(not usable))
735
736-dnl Our own version of AC_CHECK_SIZEOF(int); fixes a bug when sizeof() can't
737-dnl be printed with "%d", and avoids a warning for cross-compiling.
738-
739-AC_MSG_CHECKING(size of int)
740-AC_CACHE_VAL(ac_cv_sizeof_int,
741- [AC_TRY_RUN([#include <stdio.h>
742- main()
743- {
744- FILE *f=fopen("conftestval", "w");
745- if (!f) exit(1);
746- fprintf(f, "%d\n", (int)sizeof(int));
747- exit(0);
748- }],
749- ac_cv_sizeof_int=`cat conftestval`,
750- ac_cv_sizeof_int=0,
751- AC_MSG_ERROR(failed to compile test program))])
752-AC_MSG_RESULT($ac_cv_sizeof_int)
753-AC_DEFINE_UNQUOTED(SIZEOF_INT, $ac_cv_sizeof_int)
754+AC_CHECK_SIZEOF(int)
755
756 AC_MSG_CHECKING(whether memmove/bcopy/memcpy handle overlaps)
757 [bcopy_test_prog='
758@@ -2640,9 +2599,9 @@
759 AC_DEFINE(USEBCOPY) AC_MSG_RESULT(bcopy does),
760 AC_TRY_RUN([#define mch_memmove(s,d,l) memcpy(d,s,l) $bcopy_test_prog],
761 AC_DEFINE(USEMEMCPY) AC_MSG_RESULT(memcpy does), AC_MSG_RESULT(no),
762- AC_MSG_ERROR(failed to compile test program)),
763- AC_MSG_ERROR(failed to compile test program)),
764- AC_MSG_ERROR(failed to compile test program))
765+ AC_MSG_WARN(failed to compile test program)),
766+ AC_MSG_WARN(failed to compile test program)),
767+ AC_MSG_WARN(failed to compile test program))
768
769 dnl Check for multibyte locale functions
770 dnl Find out if _Xsetlocale() is supported by libX11.
Note: See TracBrowser for help on using the repository browser.