diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-03-18 20:58:34 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-03-18 20:58:34 +0000 |
commit | 61423e1a796fdad960620a640fe1ce3af8503234 (patch) | |
tree | 1ec597d369a3f8144c216c416df663fad0e16eed /meta/packages/bison/bison-2.3 | |
parent | 1eb093938bd5c24ba5ddd2851e96e120d1d97355 (diff) | |
download | poky-61423e1a796fdad960620a640fe1ce3af8503234.tar.gz |
bison: 2.0 -> 2.3
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/bison/bison-2.3')
-rw-r--r-- | meta/packages/bison/bison-2.3/m4.patch | 589 |
1 files changed, 589 insertions, 0 deletions
diff --git a/meta/packages/bison/bison-2.3/m4.patch b/meta/packages/bison/bison-2.3/m4.patch new file mode 100644 index 0000000000..b62fe89d04 --- /dev/null +++ b/meta/packages/bison/bison-2.3/m4.patch | |||
@@ -0,0 +1,589 @@ | |||
1 | |||
2 | # | ||
3 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher | ||
4 | # | ||
5 | |||
6 | --- /dev/null | ||
7 | +++ bison-1.875/m4/inttypes-pri.m4 | ||
8 | @@ -0,0 +1,32 @@ | ||
9 | +# inttypes-pri.m4 serial 1 (gettext-0.11.4) | ||
10 | +dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. | ||
11 | +dnl This file is free software, distributed under the terms of the GNU | ||
12 | +dnl General Public License. As a special exception to the GNU General | ||
13 | +dnl Public License, this file may be distributed as part of a program | ||
14 | +dnl that contains a configuration script generated by Autoconf, under | ||
15 | +dnl the same distribution terms as the rest of that program. | ||
16 | + | ||
17 | +dnl From Bruno Haible. | ||
18 | + | ||
19 | +# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI* | ||
20 | +# macros to non-string values. This is the case on AIX 4.3.3. | ||
21 | + | ||
22 | +AC_DEFUN([gt_INTTYPES_PRI], | ||
23 | +[ | ||
24 | + AC_REQUIRE([gt_HEADER_INTTYPES_H]) | ||
25 | + if test $gt_cv_header_inttypes_h = yes; then | ||
26 | + AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken], | ||
27 | + gt_cv_inttypes_pri_broken, | ||
28 | + [ | ||
29 | + AC_TRY_COMPILE([#include <inttypes.h> | ||
30 | +#ifdef PRId32 | ||
31 | +char *p = PRId32; | ||
32 | +#endif | ||
33 | +], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes) | ||
34 | + ]) | ||
35 | + fi | ||
36 | + if test "$gt_cv_inttypes_pri_broken" = yes; then | ||
37 | + AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1, | ||
38 | + [Define if <inttypes.h> exists and defines unusable PRI* macros.]) | ||
39 | + fi | ||
40 | +]) | ||
41 | --- /dev/null | ||
42 | +++ bison-1.875/m4/lcmessage.m4 | ||
43 | @@ -0,0 +1,32 @@ | ||
44 | +# lcmessage.m4 serial 3 (gettext-0.11.3) | ||
45 | +dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. | ||
46 | +dnl This file is free software, distributed under the terms of the GNU | ||
47 | +dnl General Public License. As a special exception to the GNU General | ||
48 | +dnl Public License, this file may be distributed as part of a program | ||
49 | +dnl that contains a configuration script generated by Autoconf, under | ||
50 | +dnl the same distribution terms as the rest of that program. | ||
51 | +dnl | ||
52 | +dnl This file can can be used in projects which are not available under | ||
53 | +dnl the GNU General Public License or the GNU Library General Public | ||
54 | +dnl License but which still want to provide support for the GNU gettext | ||
55 | +dnl functionality. | ||
56 | +dnl Please note that the actual code of the GNU gettext library is covered | ||
57 | +dnl by the GNU Library General Public License, and the rest of the GNU | ||
58 | +dnl gettext package package is covered by the GNU General Public License. | ||
59 | +dnl They are *not* in the public domain. | ||
60 | + | ||
61 | +dnl Authors: | ||
62 | +dnl Ulrich Drepper <drepper@cygnus.com>, 1995. | ||
63 | + | ||
64 | +# Check whether LC_MESSAGES is available in <locale.h>. | ||
65 | + | ||
66 | +AC_DEFUN([AM_LC_MESSAGES], | ||
67 | +[ | ||
68 | + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, | ||
69 | + [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], | ||
70 | + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) | ||
71 | + if test $am_cv_val_LC_MESSAGES = yes; then | ||
72 | + AC_DEFINE(HAVE_LC_MESSAGES, 1, | ||
73 | + [Define if your <locale.h> file defines LC_MESSAGES.]) | ||
74 | + fi | ||
75 | +]) | ||
76 | --- /dev/null | ||
77 | +++ bison-1.875/m4/uintmax_t.m4 | ||
78 | @@ -0,0 +1,29 @@ | ||
79 | +# uintmax_t.m4 serial 6 (gettext-0.11) | ||
80 | +dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. | ||
81 | +dnl This file is free software, distributed under the terms of the GNU | ||
82 | +dnl General Public License. As a special exception to the GNU General | ||
83 | +dnl Public License, this file may be distributed as part of a program | ||
84 | +dnl that contains a configuration script generated by Autoconf, under | ||
85 | +dnl the same distribution terms as the rest of that program. | ||
86 | + | ||
87 | +dnl From Paul Eggert. | ||
88 | + | ||
89 | +AC_PREREQ(2.13) | ||
90 | + | ||
91 | +# Define uintmax_t to `unsigned long' or `unsigned long long' | ||
92 | +# if <inttypes.h> does not exist. | ||
93 | + | ||
94 | +AC_DEFUN([jm_AC_TYPE_UINTMAX_T], | ||
95 | +[ | ||
96 | + AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) | ||
97 | + AC_REQUIRE([jm_AC_HEADER_STDINT_H]) | ||
98 | + if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then | ||
99 | + AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG]) | ||
100 | + test $ac_cv_type_unsigned_long_long = yes \ | ||
101 | + && ac_type='unsigned long long' \ | ||
102 | + || ac_type='unsigned long' | ||
103 | + AC_DEFINE_UNQUOTED(uintmax_t, $ac_type, | ||
104 | + [Define to unsigned long or unsigned long long | ||
105 | + if <inttypes.h> and <stdint.h> don't define.]) | ||
106 | + fi | ||
107 | +]) | ||
108 | --- /dev/null | ||
109 | +++ bison-1.875/m4/glibc21.m4 | ||
110 | @@ -0,0 +1,32 @@ | ||
111 | +# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40) | ||
112 | +dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. | ||
113 | +dnl This file is free software, distributed under the terms of the GNU | ||
114 | +dnl General Public License. As a special exception to the GNU General | ||
115 | +dnl Public License, this file may be distributed as part of a program | ||
116 | +dnl that contains a configuration script generated by Autoconf, under | ||
117 | +dnl the same distribution terms as the rest of that program. | ||
118 | + | ||
119 | +# Test for the GNU C Library, version 2.1 or newer. | ||
120 | +# From Bruno Haible. | ||
121 | + | ||
122 | +AC_DEFUN([jm_GLIBC21], | ||
123 | + [ | ||
124 | + AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, | ||
125 | + ac_cv_gnu_library_2_1, | ||
126 | + [AC_EGREP_CPP([Lucky GNU user], | ||
127 | + [ | ||
128 | +#include <features.h> | ||
129 | +#ifdef __GNU_LIBRARY__ | ||
130 | + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) | ||
131 | + Lucky GNU user | ||
132 | + #endif | ||
133 | +#endif | ||
134 | + ], | ||
135 | + ac_cv_gnu_library_2_1=yes, | ||
136 | + ac_cv_gnu_library_2_1=no) | ||
137 | + ] | ||
138 | + ) | ||
139 | + AC_SUBST(GLIBC21) | ||
140 | + GLIBC21="$ac_cv_gnu_library_2_1" | ||
141 | + ] | ||
142 | +) | ||
143 | --- /dev/null | ||
144 | +++ bison-1.875/m4/stdint_h.m4 | ||
145 | @@ -0,0 +1,28 @@ | ||
146 | +# stdint_h.m4 serial 2 (gettext-0.11.4) | ||
147 | +dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. | ||
148 | +dnl This file is free software, distributed under the terms of the GNU | ||
149 | +dnl General Public License. As a special exception to the GNU General | ||
150 | +dnl Public License, this file may be distributed as part of a program | ||
151 | +dnl that contains a configuration script generated by Autoconf, under | ||
152 | +dnl the same distribution terms as the rest of that program. | ||
153 | + | ||
154 | +dnl From Paul Eggert. | ||
155 | + | ||
156 | +# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists, | ||
157 | +# doesn't clash with <sys/types.h>, and declares uintmax_t. | ||
158 | + | ||
159 | +AC_DEFUN([jm_AC_HEADER_STDINT_H], | ||
160 | +[ | ||
161 | + AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h, | ||
162 | + [AC_TRY_COMPILE( | ||
163 | + [#include <sys/types.h> | ||
164 | +#include <stdint.h>], | ||
165 | + [uintmax_t i = (uintmax_t) -1;], | ||
166 | + jm_ac_cv_header_stdint_h=yes, | ||
167 | + jm_ac_cv_header_stdint_h=no)]) | ||
168 | + if test $jm_ac_cv_header_stdint_h = yes; then | ||
169 | + AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, | ||
170 | +[Define if <stdint.h> exists, doesn't clash with <sys/types.h>, | ||
171 | + and declares uintmax_t. ]) | ||
172 | + fi | ||
173 | +]) | ||
174 | --- /dev/null | ||
175 | +++ bison-1.875/m4/inttypes_h.m4 | ||
176 | @@ -0,0 +1,28 @@ | ||
177 | +# inttypes_h.m4 serial 4 (gettext-0.11.4) | ||
178 | +dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. | ||
179 | +dnl This file is free software, distributed under the terms of the GNU | ||
180 | +dnl General Public License. As a special exception to the GNU General | ||
181 | +dnl Public License, this file may be distributed as part of a program | ||
182 | +dnl that contains a configuration script generated by Autoconf, under | ||
183 | +dnl the same distribution terms as the rest of that program. | ||
184 | + | ||
185 | +dnl From Paul Eggert. | ||
186 | + | ||
187 | +# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists, | ||
188 | +# doesn't clash with <sys/types.h>, and declares uintmax_t. | ||
189 | + | ||
190 | +AC_DEFUN([jm_AC_HEADER_INTTYPES_H], | ||
191 | +[ | ||
192 | + AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h, | ||
193 | + [AC_TRY_COMPILE( | ||
194 | + [#include <sys/types.h> | ||
195 | +#include <inttypes.h>], | ||
196 | + [uintmax_t i = (uintmax_t) -1;], | ||
197 | + jm_ac_cv_header_inttypes_h=yes, | ||
198 | + jm_ac_cv_header_inttypes_h=no)]) | ||
199 | + if test $jm_ac_cv_header_inttypes_h = yes; then | ||
200 | + AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, | ||
201 | +[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, | ||
202 | + and declares uintmax_t. ]) | ||
203 | + fi | ||
204 | +]) | ||
205 | --- /dev/null | ||
206 | +++ bison-1.875/m4/ulonglong.m4 | ||
207 | @@ -0,0 +1,23 @@ | ||
208 | +# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40) | ||
209 | +dnl Copyright (C) 1999-2002 Free Software Foundation, Inc. | ||
210 | +dnl This file is free software, distributed under the terms of the GNU | ||
211 | +dnl General Public License. As a special exception to the GNU General | ||
212 | +dnl Public License, this file may be distributed as part of a program | ||
213 | +dnl that contains a configuration script generated by Autoconf, under | ||
214 | +dnl the same distribution terms as the rest of that program. | ||
215 | + | ||
216 | +dnl From Paul Eggert. | ||
217 | + | ||
218 | +AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG], | ||
219 | +[ | ||
220 | + AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long, | ||
221 | + [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;], | ||
222 | + [unsigned long long ullmax = (unsigned long long) -1; | ||
223 | + return ull << i | ull >> i | ullmax / ull | ullmax % ull;], | ||
224 | + ac_cv_type_unsigned_long_long=yes, | ||
225 | + ac_cv_type_unsigned_long_long=no)]) | ||
226 | + if test $ac_cv_type_unsigned_long_long = yes; then | ||
227 | + AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1, | ||
228 | + [Define if you have the unsigned long long type.]) | ||
229 | + fi | ||
230 | +]) | ||
231 | --- /dev/null | ||
232 | +++ bison-1.875/m4/codeset.m4 | ||
233 | @@ -0,0 +1,23 @@ | ||
234 | +# codeset.m4 serial AM1 (gettext-0.10.40) | ||
235 | +dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. | ||
236 | +dnl This file is free software, distributed under the terms of the GNU | ||
237 | +dnl General Public License. As a special exception to the GNU General | ||
238 | +dnl Public License, this file may be distributed as part of a program | ||
239 | +dnl that contains a configuration script generated by Autoconf, under | ||
240 | +dnl the same distribution terms as the rest of that program. | ||
241 | + | ||
242 | +dnl From Bruno Haible. | ||
243 | + | ||
244 | +AC_DEFUN([AM_LANGINFO_CODESET], | ||
245 | +[ | ||
246 | + AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, | ||
247 | + [AC_TRY_LINK([#include <langinfo.h>], | ||
248 | + [char* cs = nl_langinfo(CODESET);], | ||
249 | + am_cv_langinfo_codeset=yes, | ||
250 | + am_cv_langinfo_codeset=no) | ||
251 | + ]) | ||
252 | + if test $am_cv_langinfo_codeset = yes; then | ||
253 | + AC_DEFINE(HAVE_LANGINFO_CODESET, 1, | ||
254 | + [Define if you have <langinfo.h> and nl_langinfo(CODESET).]) | ||
255 | + fi | ||
256 | +]) | ||
257 | --- /dev/null | ||
258 | +++ bison-1.875/m4/intdiv0.m4 | ||
259 | @@ -0,0 +1,72 @@ | ||
260 | +# intdiv0.m4 serial 1 (gettext-0.11.3) | ||
261 | +dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
262 | +dnl This file is free software, distributed under the terms of the GNU | ||
263 | +dnl General Public License. As a special exception to the GNU General | ||
264 | +dnl Public License, this file may be distributed as part of a program | ||
265 | +dnl that contains a configuration script generated by Autoconf, under | ||
266 | +dnl the same distribution terms as the rest of that program. | ||
267 | + | ||
268 | +dnl From Bruno Haible. | ||
269 | + | ||
270 | +AC_DEFUN([gt_INTDIV0], | ||
271 | +[ | ||
272 | + AC_REQUIRE([AC_PROG_CC])dnl | ||
273 | + AC_REQUIRE([AC_CANONICAL_HOST])dnl | ||
274 | + | ||
275 | + AC_CACHE_CHECK([whether integer division by zero raises SIGFPE], | ||
276 | + gt_cv_int_divbyzero_sigfpe, | ||
277 | + [ | ||
278 | + AC_TRY_RUN([ | ||
279 | +#include <stdlib.h> | ||
280 | +#include <signal.h> | ||
281 | + | ||
282 | +static void | ||
283 | +#ifdef __cplusplus | ||
284 | +sigfpe_handler (int sig) | ||
285 | +#else | ||
286 | +sigfpe_handler (sig) int sig; | ||
287 | +#endif | ||
288 | +{ | ||
289 | + /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */ | ||
290 | + exit (sig != SIGFPE); | ||
291 | +} | ||
292 | + | ||
293 | +int x = 1; | ||
294 | +int y = 0; | ||
295 | +int z; | ||
296 | +int nan; | ||
297 | + | ||
298 | +int main () | ||
299 | +{ | ||
300 | + signal (SIGFPE, sigfpe_handler); | ||
301 | +/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */ | ||
302 | +#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP) | ||
303 | + signal (SIGTRAP, sigfpe_handler); | ||
304 | +#endif | ||
305 | +/* Linux/SPARC yields signal SIGILL. */ | ||
306 | +#if defined (__sparc__) && defined (__linux__) | ||
307 | + signal (SIGILL, sigfpe_handler); | ||
308 | +#endif | ||
309 | + | ||
310 | + z = x / y; | ||
311 | + nan = y / y; | ||
312 | + exit (1); | ||
313 | +} | ||
314 | +], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no, | ||
315 | + [ | ||
316 | + # Guess based on the CPU. | ||
317 | + case "$host_cpu" in | ||
318 | + alpha* | i[34567]86 | m68k | s390*) | ||
319 | + gt_cv_int_divbyzero_sigfpe="guessing yes";; | ||
320 | + *) | ||
321 | + gt_cv_int_divbyzero_sigfpe="guessing no";; | ||
322 | + esac | ||
323 | + ]) | ||
324 | + ]) | ||
325 | + case "$gt_cv_int_divbyzero_sigfpe" in | ||
326 | + *yes) value=1;; | ||
327 | + *) value=0;; | ||
328 | + esac | ||
329 | + AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value, | ||
330 | + [Define if integer division by zero raises signal SIGFPE.]) | ||
331 | +]) | ||
332 | --- /dev/null | ||
333 | +++ bison-1.875/m4/glib.m4 | ||
334 | @@ -0,0 +1,196 @@ | ||
335 | +# Configure paths for GLIB | ||
336 | +# Owen Taylor 97-11-3 | ||
337 | + | ||
338 | +dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) | ||
339 | +dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or | ||
340 | +dnl gthread is specified in MODULES, pass to glib-config | ||
341 | +dnl | ||
342 | +AC_DEFUN(AM_PATH_GLIB, | ||
343 | +[dnl | ||
344 | +dnl Get the cflags and libraries from the glib-config script | ||
345 | +dnl | ||
346 | +AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)], | ||
347 | + glib_config_prefix="$withval", glib_config_prefix="") | ||
348 | +AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)], | ||
349 | + glib_config_exec_prefix="$withval", glib_config_exec_prefix="") | ||
350 | +AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program], | ||
351 | + , enable_glibtest=yes) | ||
352 | + | ||
353 | + if test x$glib_config_exec_prefix != x ; then | ||
354 | + glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix" | ||
355 | + if test x${GLIB_CONFIG+set} != xset ; then | ||
356 | + GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config | ||
357 | + fi | ||
358 | + fi | ||
359 | + if test x$glib_config_prefix != x ; then | ||
360 | + glib_config_args="$glib_config_args --prefix=$glib_config_prefix" | ||
361 | + if test x${GLIB_CONFIG+set} != xset ; then | ||
362 | + GLIB_CONFIG=$glib_config_prefix/bin/glib-config | ||
363 | + fi | ||
364 | + fi | ||
365 | + | ||
366 | + for module in . $4 | ||
367 | + do | ||
368 | + case "$module" in | ||
369 | + gmodule) | ||
370 | + glib_config_args="$glib_config_args gmodule" | ||
371 | + ;; | ||
372 | + gthread) | ||
373 | + glib_config_args="$glib_config_args gthread" | ||
374 | + ;; | ||
375 | + esac | ||
376 | + done | ||
377 | + | ||
378 | + AC_PATH_PROG(GLIB_CONFIG, glib-config, no) | ||
379 | + min_glib_version=ifelse([$1], ,0.99.7,$1) | ||
380 | + AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) | ||
381 | + no_glib="" | ||
382 | + if test "$GLIB_CONFIG" = "no" ; then | ||
383 | + no_glib=yes | ||
384 | + else | ||
385 | + GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` | ||
386 | + GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` | ||
387 | + glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ | ||
388 | + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` | ||
389 | + glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ | ||
390 | + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` | ||
391 | + glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \ | ||
392 | + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` | ||
393 | + if test "x$enable_glibtest" = "xyes" ; then | ||
394 | + ac_save_CFLAGS="$CFLAGS" | ||
395 | + ac_save_LIBS="$LIBS" | ||
396 | + CFLAGS="$CFLAGS $GLIB_CFLAGS" | ||
397 | + LIBS="$GLIB_LIBS $LIBS" | ||
398 | +dnl | ||
399 | +dnl Now check if the installed GLIB is sufficiently new. (Also sanity | ||
400 | +dnl checks the results of glib-config to some extent | ||
401 | +dnl | ||
402 | + rm -f conf.glibtest | ||
403 | + AC_TRY_RUN([ | ||
404 | +#include <glib.h> | ||
405 | +#include <stdio.h> | ||
406 | +#include <stdlib.h> | ||
407 | + | ||
408 | +int | ||
409 | +main () | ||
410 | +{ | ||
411 | + int major, minor, micro; | ||
412 | + char *tmp_version; | ||
413 | + | ||
414 | + system ("touch conf.glibtest"); | ||
415 | + | ||
416 | + /* HP/UX 9 (%@#!) writes to sscanf strings */ | ||
417 | + tmp_version = g_strdup("$min_glib_version"); | ||
418 | + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { | ||
419 | + printf("%s, bad version string\n", "$min_glib_version"); | ||
420 | + exit(1); | ||
421 | + } | ||
422 | + | ||
423 | + if ((glib_major_version != $glib_config_major_version) || | ||
424 | + (glib_minor_version != $glib_config_minor_version) || | ||
425 | + (glib_micro_version != $glib_config_micro_version)) | ||
426 | + { | ||
427 | + printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", | ||
428 | + $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, | ||
429 | + glib_major_version, glib_minor_version, glib_micro_version); | ||
430 | + printf ("*** was found! If glib-config was correct, then it is best\n"); | ||
431 | + printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n"); | ||
432 | + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); | ||
433 | + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); | ||
434 | + printf("*** required on your system.\n"); | ||
435 | + printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n"); | ||
436 | + printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n"); | ||
437 | + printf("*** before re-running configure\n"); | ||
438 | + } | ||
439 | + else if ((glib_major_version != GLIB_MAJOR_VERSION) || | ||
440 | + (glib_minor_version != GLIB_MINOR_VERSION) || | ||
441 | + (glib_micro_version != GLIB_MICRO_VERSION)) | ||
442 | + { | ||
443 | + printf("*** GLIB header files (version %d.%d.%d) do not match\n", | ||
444 | + GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); | ||
445 | + printf("*** library (version %d.%d.%d)\n", | ||
446 | + glib_major_version, glib_minor_version, glib_micro_version); | ||
447 | + } | ||
448 | + else | ||
449 | + { | ||
450 | + if ((glib_major_version > major) || | ||
451 | + ((glib_major_version == major) && (glib_minor_version > minor)) || | ||
452 | + ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) | ||
453 | + { | ||
454 | + return 0; | ||
455 | + } | ||
456 | + else | ||
457 | + { | ||
458 | + printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", | ||
459 | + glib_major_version, glib_minor_version, glib_micro_version); | ||
460 | + printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", | ||
461 | + major, minor, micro); | ||
462 | + printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); | ||
463 | + printf("***\n"); | ||
464 | + printf("*** If you have already installed a sufficiently new version, this error\n"); | ||
465 | + printf("*** probably means that the wrong copy of the glib-config shell script is\n"); | ||
466 | + printf("*** being found. The easiest way to fix this is to remove the old version\n"); | ||
467 | + printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n"); | ||
468 | + printf("*** correct copy of glib-config. (In this case, you will have to\n"); | ||
469 | + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); | ||
470 | + printf("*** so that the correct libraries are found at run-time))\n"); | ||
471 | + } | ||
472 | + } | ||
473 | + return 1; | ||
474 | +} | ||
475 | +],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) | ||
476 | + CFLAGS="$ac_save_CFLAGS" | ||
477 | + LIBS="$ac_save_LIBS" | ||
478 | + fi | ||
479 | + fi | ||
480 | + if test "x$no_glib" = x ; then | ||
481 | + AC_MSG_RESULT(yes) | ||
482 | + ifelse([$2], , :, [$2]) | ||
483 | + else | ||
484 | + AC_MSG_RESULT(no) | ||
485 | + if test "$GLIB_CONFIG" = "no" ; then | ||
486 | + echo "*** The glib-config script installed by GLIB could not be found" | ||
487 | + echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in" | ||
488 | + echo "*** your path, or set the GLIB_CONFIG environment variable to the" | ||
489 | + echo "*** full path to glib-config." | ||
490 | + else | ||
491 | + if test -f conf.glibtest ; then | ||
492 | + : | ||
493 | + else | ||
494 | + echo "*** Could not run GLIB test program, checking why..." | ||
495 | + CFLAGS="$CFLAGS $GLIB_CFLAGS" | ||
496 | + LIBS="$LIBS $GLIB_LIBS" | ||
497 | + AC_TRY_LINK([ | ||
498 | +#include <glib.h> | ||
499 | +#include <stdio.h> | ||
500 | +], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], | ||
501 | + [ echo "*** The test program compiled, but did not run. This usually means" | ||
502 | + echo "*** that the run-time linker is not finding GLIB or finding the wrong" | ||
503 | + echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" | ||
504 | + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" | ||
505 | + echo "*** to the installed location Also, make sure you have run ldconfig if that" | ||
506 | + echo "*** is required on your system" | ||
507 | + echo "***" | ||
508 | + echo "*** If you have an old version installed, it is best to remove it, although" | ||
509 | + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" | ||
510 | + echo "***" | ||
511 | + echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" | ||
512 | + echo "*** came with the system with the command" | ||
513 | + echo "***" | ||
514 | + echo "*** rpm --erase --nodeps gtk gtk-devel" ], | ||
515 | + [ echo "*** The test program failed to compile or link. See the file config.log for the" | ||
516 | + echo "*** exact error that occured. This usually means GLIB was incorrectly installed" | ||
517 | + echo "*** or that you have moved GLIB since it was installed. In the latter case, you" | ||
518 | + echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ]) | ||
519 | + CFLAGS="$ac_save_CFLAGS" | ||
520 | + LIBS="$ac_save_LIBS" | ||
521 | + fi | ||
522 | + fi | ||
523 | + GLIB_CFLAGS="" | ||
524 | + GLIB_LIBS="" | ||
525 | + ifelse([$3], , :, [$3]) | ||
526 | + fi | ||
527 | + AC_SUBST(GLIB_CFLAGS) | ||
528 | + AC_SUBST(GLIB_LIBS) | ||
529 | + rm -f conf.glibtest | ||
530 | +]) | ||
531 | --- /dev/null | ||
532 | +++ bison-1.875/m4/inttypes.m4 | ||
533 | @@ -0,0 +1,27 @@ | ||
534 | +# inttypes.m4 serial 1 (gettext-0.11.4) | ||
535 | +dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. | ||
536 | +dnl This file is free software, distributed under the terms of the GNU | ||
537 | +dnl General Public License. As a special exception to the GNU General | ||
538 | +dnl Public License, this file may be distributed as part of a program | ||
539 | +dnl that contains a configuration script generated by Autoconf, under | ||
540 | +dnl the same distribution terms as the rest of that program. | ||
541 | + | ||
542 | +dnl From Paul Eggert. | ||
543 | + | ||
544 | +# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with | ||
545 | +# <sys/types.h>. | ||
546 | + | ||
547 | +AC_DEFUN([gt_HEADER_INTTYPES_H], | ||
548 | +[ | ||
549 | + AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h, | ||
550 | + [ | ||
551 | + AC_TRY_COMPILE( | ||
552 | + [#include <sys/types.h> | ||
553 | +#include <inttypes.h>], | ||
554 | + [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no) | ||
555 | + ]) | ||
556 | + if test $gt_cv_header_inttypes_h = yes; then | ||
557 | + AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1, | ||
558 | + [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.]) | ||
559 | + fi | ||
560 | +]) | ||
561 | --- /dev/null | ||
562 | +++ bison-1.875/m4/isc-posix.m4 | ||
563 | @@ -0,0 +1,26 @@ | ||
564 | +# isc-posix.m4 serial 2 (gettext-0.11.2) | ||
565 | +dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. | ||
566 | +dnl This file is free software, distributed under the terms of the GNU | ||
567 | +dnl General Public License. As a special exception to the GNU General | ||
568 | +dnl Public License, this file may be distributed as part of a program | ||
569 | +dnl that contains a configuration script generated by Autoconf, under | ||
570 | +dnl the same distribution terms as the rest of that program. | ||
571 | + | ||
572 | +# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. | ||
573 | + | ||
574 | +# This test replaces the one in autoconf. | ||
575 | +# Currently this macro should have the same name as the autoconf macro | ||
576 | +# because gettext's gettext.m4 (distributed in the automake package) | ||
577 | +# still uses it. Otherwise, the use in gettext.m4 makes autoheader | ||
578 | +# give these diagnostics: | ||
579 | +# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX | ||
580 | +# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX | ||
581 | + | ||
582 | +undefine([AC_ISC_POSIX]) | ||
583 | + | ||
584 | +AC_DEFUN([AC_ISC_POSIX], | ||
585 | + [ | ||
586 | + dnl This test replaces the obsolescent AC_ISC_POSIX kludge. | ||
587 | + AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) | ||
588 | + ] | ||
589 | +) | ||