| blob | e5dd8343aff57f695a73ee81d0510826c087e79b |
1 diff -rup grub-0.97.oorig/aclocal.m4 grub-0.97/aclocal.m4
2 --- grub-0.97.oorig/aclocal.m4 2005-05-08 04:41:18.000000000 +0200
3 +++ grub-0.97/aclocal.m4 2006-03-12 14:00:35.000000000 +0100
4 @@ -1,7 +1,7 @@
5 -# generated automatically by aclocal 1.9.4 -*- Autoconf -*-
6 +# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
8 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
9 -# Free Software Foundation, Inc.
10 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
11 +# 2005 Free Software Foundation, Inc.
12 # This file is free software; the Free Software Foundation
13 # gives unlimited permission to copy and/or distribute it,
14 # with or without modifications, as long as this notice is preserved.
15 @@ -11,23 +11,11 @@
16 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
17 # PARTICULAR PURPOSE.
19 -# -*- Autoconf -*-
20 -# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
21 -# Generated from amversion.in; do not edit by hand.
22 -
23 -# This program is free software; you can redistribute it and/or modify
24 -# it under the terms of the GNU General Public License as published by
25 -# the Free Software Foundation; either version 2, or (at your option)
26 -# any later version.
27 -
28 -# This program is distributed in the hope that it will be useful,
29 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
30 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
31 -# GNU General Public License for more details.
32 -
33 -# You should have received a copy of the GNU General Public License
34 -# along with this program; if not, write to the Free Software
35 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
36 +# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
37 +#
38 +# This file is free software; the Free Software Foundation
39 +# gives unlimited permission to copy and/or distribute it,
40 +# with or without modifications, as long as this notice is preserved.
42 # AM_AUTOMAKE_VERSION(VERSION)
43 # ----------------------------
44 @@ -40,26 +28,15 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api
45 # Call AM_AUTOMAKE_VERSION so it can be traced.
46 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
47 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
48 - [AM_AUTOMAKE_VERSION([1.9.4])])
49 -
50 -# AM_AUX_DIR_EXPAND
51 -
52 -# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
53 + [AM_AUTOMAKE_VERSION([1.9.6])])
55 -# This program is free software; you can redistribute it and/or modify
56 -# it under the terms of the GNU General Public License as published by
57 -# the Free Software Foundation; either version 2, or (at your option)
58 -# any later version.
59 +# AM_AUX_DIR_EXPAND -*- Autoconf -*-
61 -# This program is distributed in the hope that it will be useful,
62 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
63 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
64 -# GNU General Public License for more details.
65 -
66 -# You should have received a copy of the GNU General Public License
67 -# along with this program; if not, write to the Free Software
68 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
69 -# 02111-1307, USA.
70 +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
71 +#
72 +# This file is free software; the Free Software Foundation
73 +# gives unlimited permission to copy and/or distribute it,
74 +# with or without modifications, as long as this notice is preserved.
76 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
77 # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
78 @@ -106,26 +83,16 @@ AC_PREREQ([2.50])dnl
79 am_aux_dir=`cd $ac_aux_dir && pwd`
80 ])
82 -# AM_CONDITIONAL -*- Autoconf -*-
83 +# AM_CONDITIONAL -*- Autoconf -*-
85 -# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
86 -
87 -# This program is free software; you can redistribute it and/or modify
88 -# it under the terms of the GNU General Public License as published by
89 -# the Free Software Foundation; either version 2, or (at your option)
90 -# any later version.
91 -
92 -# This program is distributed in the hope that it will be useful,
93 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
94 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
95 -# GNU General Public License for more details.
96 -
97 -# You should have received a copy of the GNU General Public License
98 -# along with this program; if not, write to the Free Software
99 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
100 -# 02111-1307, USA.
101 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
102 +# Free Software Foundation, Inc.
103 +#
104 +# This file is free software; the Free Software Foundation
105 +# gives unlimited permission to copy and/or distribute it,
106 +# with or without modifications, as long as this notice is preserved.
108 -# serial 6
109 +# serial 7
111 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
112 # -------------------------------------
113 @@ -149,26 +116,15 @@ AC_CONFIG_COMMANDS_PRE(
114 Usually this means the macro was only invoked conditionally.]])
115 fi])])
117 -# serial 7 -*- Autoconf -*-
119 -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
120 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
121 # Free Software Foundation, Inc.
122 +#
123 +# This file is free software; the Free Software Foundation
124 +# gives unlimited permission to copy and/or distribute it,
125 +# with or without modifications, as long as this notice is preserved.
127 -# This program is free software; you can redistribute it and/or modify
128 -# it under the terms of the GNU General Public License as published by
129 -# the Free Software Foundation; either version 2, or (at your option)
130 -# any later version.
131 -
132 -# This program is distributed in the hope that it will be useful,
133 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
134 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
135 -# GNU General Public License for more details.
136 -
137 -# You should have received a copy of the GNU General Public License
138 -# along with this program; if not, write to the Free Software
139 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
140 -# 02111-1307, USA.
141 -
142 +# serial 8
144 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
145 # written in clear, in which case automake, when reading aclocal.m4,
146 @@ -177,7 +133,6 @@ fi])])
147 # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
150 -
151 # _AM_DEPENDENCIES(NAME)
152 # ----------------------
153 # See how the compiler implements dependency checking.
154 @@ -317,27 +272,16 @@ AM_CONDITIONAL([AMDEP], [test "x$enable_
155 AC_SUBST([AMDEPBACKSLASH])
156 ])
158 -# Generate code to set up dependency tracking. -*- Autoconf -*-
159 -
160 -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
161 -# Free Software Foundation, Inc.
162 -
163 -# This program is free software; you can redistribute it and/or modify
164 -# it under the terms of the GNU General Public License as published by
165 -# the Free Software Foundation; either version 2, or (at your option)
166 -# any later version.
167 +# Generate code to set up dependency tracking. -*- Autoconf -*-
169 -# This program is distributed in the hope that it will be useful,
170 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
171 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
172 -# GNU General Public License for more details.
173 -
174 -# You should have received a copy of the GNU General Public License
175 -# along with this program; if not, write to the Free Software
176 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
177 -# 02111-1307, USA.
178 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
179 +# Free Software Foundation, Inc.
180 +#
181 +# This file is free software; the Free Software Foundation
182 +# gives unlimited permission to copy and/or distribute it,
183 +# with or without modifications, as long as this notice is preserved.
185 -#serial 2
186 +#serial 3
188 # _AM_OUTPUT_DEPENDENCY_COMMANDS
189 # ------------------------------
190 @@ -396,30 +340,19 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
191 [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
192 ])
194 -# Do all the work for Automake. -*- Autoconf -*-
195 +# Do all the work for Automake. -*- Autoconf -*-
197 -# This macro actually does too much some checks are only needed if
198 -# your package does certain things. But this isn't really a big deal.
199 -
200 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
201 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
202 # Free Software Foundation, Inc.
203 +#
204 +# This file is free software; the Free Software Foundation
205 +# gives unlimited permission to copy and/or distribute it,
206 +# with or without modifications, as long as this notice is preserved.
208 -# This program is free software; you can redistribute it and/or modify
209 -# it under the terms of the GNU General Public License as published by
210 -# the Free Software Foundation; either version 2, or (at your option)
211 -# any later version.
212 -
213 -# This program is distributed in the hope that it will be useful,
214 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
215 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
216 -# GNU General Public License for more details.
217 -
218 -# You should have received a copy of the GNU General Public License
219 -# along with this program; if not, write to the Free Software
220 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
221 -# 02111-1307, USA.
222 +# serial 12
224 -# serial 11
225 +# This macro actually does too much. Some checks are only needed if
226 +# your package does certain things. But this isn't really a big deal.
228 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
229 # AM_INIT_AUTOMAKE([OPTIONS])
230 @@ -521,51 +454,27 @@ for _am_header in $config_headers :; do
231 done
232 echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
234 +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
235 +#
236 +# This file is free software; the Free Software Foundation
237 +# gives unlimited permission to copy and/or distribute it,
238 +# with or without modifications, as long as this notice is preserved.
239 +
240 # AM_PROG_INSTALL_SH
241 # ------------------
242 # Define $install_sh.
243 -
244 -# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
245 -
246 -# This program is free software; you can redistribute it and/or modify
247 -# it under the terms of the GNU General Public License as published by
248 -# the Free Software Foundation; either version 2, or (at your option)
249 -# any later version.
250 -
251 -# This program is distributed in the hope that it will be useful,
252 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
253 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
254 -# GNU General Public License for more details.
255 -
256 -# You should have received a copy of the GNU General Public License
257 -# along with this program; if not, write to the Free Software
258 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
259 -# 02111-1307, USA.
260 -
261 AC_DEFUN([AM_PROG_INSTALL_SH],
262 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
263 install_sh=${install_sh-"$am_aux_dir/install-sh"}
264 AC_SUBST(install_sh)])
266 -# -*- Autoconf -*-
267 -# Copyright (C) 2003 Free Software Foundation, Inc.
268 -
269 -# This program is free software; you can redistribute it and/or modify
270 -# it under the terms of the GNU General Public License as published by
271 -# the Free Software Foundation; either version 2, or (at your option)
272 -# any later version.
273 -
274 -# This program is distributed in the hope that it will be useful,
275 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
276 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
277 -# GNU General Public License for more details.
278 -
279 -# You should have received a copy of the GNU General Public License
280 -# along with this program; if not, write to the Free Software
281 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
282 -# 02111-1307, USA.
283 +# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
284 +#
285 +# This file is free software; the Free Software Foundation
286 +# gives unlimited permission to copy and/or distribute it,
287 +# with or without modifications, as long as this notice is preserved.
289 -# serial 1
290 +# serial 2
292 # Check whether the underlying file-system supports filenames
293 # with a leading dot. For instance MS-DOS doesn't.
294 @@ -580,28 +489,17 @@ fi
295 rmdir .tst 2>/dev/null
296 AC_SUBST([am__leading_dot])])
298 -# Add --enable-maintainer-mode option to configure.
299 +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
300 # From Jim Meyering
302 -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004
303 +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
304 # Free Software Foundation, Inc.
305 +#
306 +# This file is free software; the Free Software Foundation
307 +# gives unlimited permission to copy and/or distribute it,
308 +# with or without modifications, as long as this notice is preserved.
310 -# This program is free software; you can redistribute it and/or modify
311 -# it under the terms of the GNU General Public License as published by
312 -# the Free Software Foundation; either version 2, or (at your option)
313 -# any later version.
314 -
315 -# This program is distributed in the hope that it will be useful,
316 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
317 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
318 -# GNU General Public License for more details.
319 -
320 -# You should have received a copy of the GNU General Public License
321 -# along with this program; if not, write to the Free Software
322 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
323 -# 02111-1307, USA.
324 -
325 -# serial 3
326 +# serial 4
328 AC_DEFUN([AM_MAINTAINER_MODE],
329 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
330 @@ -620,26 +518,15 @@ AC_DEFUN([AM_MAINTAINER_MODE],
332 AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
334 -# Check to see how 'make' treats includes. -*- Autoconf -*-
335 -
336 -# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
337 +# Check to see how 'make' treats includes. -*- Autoconf -*-
339 -# This program is free software; you can redistribute it and/or modify
340 -# it under the terms of the GNU General Public License as published by
341 -# the Free Software Foundation; either version 2, or (at your option)
342 -# any later version.
343 -
344 -# This program is distributed in the hope that it will be useful,
345 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
346 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
347 -# GNU General Public License for more details.
348 -
349 -# You should have received a copy of the GNU General Public License
350 -# along with this program; if not, write to the Free Software
351 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
352 -# 02111-1307, USA.
353 +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
354 +#
355 +# This file is free software; the Free Software Foundation
356 +# gives unlimited permission to copy and/or distribute it,
357 +# with or without modifications, as long as this notice is preserved.
359 -# serial 2
360 +# serial 3
362 # AM_MAKE_INCLUDE()
363 # -----------------
364 @@ -683,27 +570,16 @@ AC_MSG_RESULT([$_am_result])
365 rm -f confinc confmf
366 ])
368 -# -*- Autoconf -*-
369 -
370 -
371 -# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
372 -
373 -# This program is free software; you can redistribute it and/or modify
374 -# it under the terms of the GNU General Public License as published by
375 -# the Free Software Foundation; either version 2, or (at your option)
376 -# any later version.
377 +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
379 -# This program is distributed in the hope that it will be useful,
380 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
381 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
382 -# GNU General Public License for more details.
383 -
384 -# You should have received a copy of the GNU General Public License
385 -# along with this program; if not, write to the Free Software
386 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
387 -# 02111-1307, USA.
388 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
389 +# Free Software Foundation, Inc.
390 +#
391 +# This file is free software; the Free Software Foundation
392 +# gives unlimited permission to copy and/or distribute it,
393 +# with or without modifications, as long as this notice is preserved.
395 -# serial 3
396 +# serial 4
398 # AM_MISSING_PROG(NAME, PROGRAM)
399 # ------------------------------
400 @@ -729,27 +605,16 @@ else
401 fi
402 ])
404 +# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
405 +#
406 +# This file is free software; the Free Software Foundation
407 +# gives unlimited permission to copy and/or distribute it,
408 +# with or without modifications, as long as this notice is preserved.
409 +
410 # AM_PROG_MKDIR_P
411 # ---------------
412 # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
413 -
414 -# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
415 -
416 -# This program is free software; you can redistribute it and/or modify
417 -# it under the terms of the GNU General Public License as published by
418 -# the Free Software Foundation; either version 2, or (at your option)
419 -# any later version.
420 -
421 -# This program is distributed in the hope that it will be useful,
422 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
423 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
424 -# GNU General Public License for more details.
425 -
426 -# You should have received a copy of the GNU General Public License
427 -# along with this program; if not, write to the Free Software
428 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
429 -# 02111-1307, USA.
430 -
431 +#
432 # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
433 # created by `make install' are always world readable, even if the
434 # installer happens to have an overly restrictive umask (e.g. 077).
435 @@ -803,26 +668,15 @@ else
436 fi
437 AC_SUBST([mkdir_p])])
439 -# Helper functions for option handling. -*- Autoconf -*-
440 +# Helper functions for option handling. -*- Autoconf -*-
442 -# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
443 -
444 -# This program is free software; you can redistribute it and/or modify
445 -# it under the terms of the GNU General Public License as published by
446 -# the Free Software Foundation; either version 2, or (at your option)
447 -# any later version.
448 -
449 -# This program is distributed in the hope that it will be useful,
450 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
451 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
452 -# GNU General Public License for more details.
453 -
454 -# You should have received a copy of the GNU General Public License
455 -# along with this program; if not, write to the Free Software
456 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
457 -# 02111-1307, USA.
458 +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
459 +#
460 +# This file is free software; the Free Software Foundation
461 +# gives unlimited permission to copy and/or distribute it,
462 +# with or without modifications, as long as this notice is preserved.
464 -# serial 2
465 +# serial 3
467 # _AM_MANGLE_OPTION(NAME)
468 # -----------------------
469 @@ -847,28 +701,16 @@ AC_DEFUN([_AM_SET_OPTIONS],
470 AC_DEFUN([_AM_IF_OPTION],
471 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
473 -#
474 -# Check to make sure that the build environment is sane.
475 -#
476 -
477 -# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
478 -
479 -# This program is free software; you can redistribute it and/or modify
480 -# it under the terms of the GNU General Public License as published by
481 -# the Free Software Foundation; either version 2, or (at your option)
482 -# any later version.
483 +# Check to make sure that the build environment is sane. -*- Autoconf -*-
485 -# This program is distributed in the hope that it will be useful,
486 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
487 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
488 -# GNU General Public License for more details.
489 -
490 -# You should have received a copy of the GNU General Public License
491 -# along with this program; if not, write to the Free Software
492 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
493 -# 02111-1307, USA.
494 +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
495 +# Free Software Foundation, Inc.
496 +#
497 +# This file is free software; the Free Software Foundation
498 +# gives unlimited permission to copy and/or distribute it,
499 +# with or without modifications, as long as this notice is preserved.
501 -# serial 3
502 +# serial 4
504 # AM_SANITY_CHECK
505 # ---------------
506 @@ -911,25 +753,14 @@ Check your system clock])
507 fi
508 AC_MSG_RESULT(yes)])
510 -# AM_PROG_INSTALL_STRIP
511 -
512 -# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
513 -
514 -# This program is free software; you can redistribute it and/or modify
515 -# it under the terms of the GNU General Public License as published by
516 -# the Free Software Foundation; either version 2, or (at your option)
517 -# any later version.
518 -
519 -# This program is distributed in the hope that it will be useful,
520 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
521 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
522 -# GNU General Public License for more details.
523 -
524 -# You should have received a copy of the GNU General Public License
525 -# along with this program; if not, write to the Free Software
526 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
527 -# 02111-1307, USA.
528 +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
529 +#
530 +# This file is free software; the Free Software Foundation
531 +# gives unlimited permission to copy and/or distribute it,
532 +# with or without modifications, as long as this notice is preserved.
534 +# AM_PROG_INSTALL_STRIP
535 +# ---------------------
536 # One issue with vendor `install' (even GNU) is that you can't
537 # specify the program used to strip binaries. This is especially
538 # annoying in cross-compiling environments, where the build's strip
539 @@ -952,25 +783,13 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
541 # Check how to create a tarball. -*- Autoconf -*-
543 -# Copyright (C) 2004 Free Software Foundation, Inc.
544 -
545 -# This program is free software; you can redistribute it and/or modify
546 -# it under the terms of the GNU General Public License as published by
547 -# the Free Software Foundation; either version 2, or (at your option)
548 -# any later version.
549 -
550 -# This program is distributed in the hope that it will be useful,
551 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
552 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
553 -# GNU General Public License for more details.
554 -
555 -# You should have received a copy of the GNU General Public License
556 -# along with this program; if not, write to the Free Software
557 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
558 -# 02111-1307, USA.
559 -
560 -# serial 1
561 +# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
562 +#
563 +# This file is free software; the Free Software Foundation
564 +# gives unlimited permission to copy and/or distribute it,
565 +# with or without modifications, as long as this notice is preserved.
567 +# serial 2
569 # _AM_PROG_TAR(FORMAT)
570 # --------------------
571 Only in grub-0.97/: autom4te.cache
572 diff -rup grub-0.97.oorig/configure grub-0.97/configure
573 --- grub-0.97.oorig/configure 2005-05-08 04:48:12.000000000 +0200
574 +++ grub-0.97/configure 2006-03-12 14:00:38.000000000 +0100
575 @@ -311,7 +311,7 @@ ac_includes_default="\
576 # include <unistd.h>
577 #endif"
579 -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT PERL CC ac_ct_CC CFLAGS LDFLAGS CPPFLAGS EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CCAS RANLIB ac_ct_RANLIB STAGE1_CFLAGS STAGE2_CFLAGS GRUB_CFLAGS OBJCOPY ac_ct_OBJCOPY GRUB_LIBS CPP EGREP NETBOOT_SUPPORT_TRUE NETBOOT_SUPPORT_FALSE DISKLESS_SUPPORT_TRUE DISKLESS_SUPPORT_FALSE HERCULES_SUPPORT_TRUE HERCULES_SUPPORT_FALSE SERIAL_SUPPORT_TRUE SERIAL_SUPPORT_FALSE SERIAL_SPEED_SIMULATION_TRUE SERIAL_SPEED_SIMULATION_FALSE BUILD_EXAMPLE_KERNEL_TRUE BUILD_EXAMPLE_KERNEL_FALSE FSYS_CFLAGS NET_CFLAGS NET_EXTRAFLAGS NETBOOT_DRIVERS CCASFLAGS LIBOBJS LTLIBOBJS'
580 +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT PERL CC ac_ct_CC CFLAGS LDFLAGS CPPFLAGS EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CCAS RANLIB ac_ct_RANLIB STAGE1_CFLAGS STAGE2_CFLAGS GRUB_CFLAGS OBJCOPY ac_ct_OBJCOPY GRUB_LIBS CPP EGREP NETBOOT_SUPPORT_TRUE NETBOOT_SUPPORT_FALSE DISKLESS_SUPPORT_TRUE DISKLESS_SUPPORT_FALSE GRAPHICS_SUPPORT_TRUE GRAPHICS_SUPPORT_FALSE HERCULES_SUPPORT_TRUE HERCULES_SUPPORT_FALSE SERIAL_SUPPORT_TRUE SERIAL_SUPPORT_FALSE SERIAL_SPEED_SIMULATION_TRUE SERIAL_SPEED_SIMULATION_FALSE BUILD_EXAMPLE_KERNEL_TRUE BUILD_EXAMPLE_KERNEL_FALSE FSYS_CFLAGS NET_CFLAGS NET_EXTRAFLAGS NETBOOT_DRIVERS CCASFLAGS LIBOBJS LTLIBOBJS'
581 ac_subst_files=''
583 # Initialize some variables set by options.
584 @@ -914,6 +914,7 @@ Optional Features:
585 set the default memory location for WD/SMC
586 --enable-cs-scan=LIST probe for CS89x0 base address using LIST
587 --enable-diskless enable diskless support
588 + --disable-graphics disable graphics terminal support
589 --disable-hercules disable hercules terminal support
590 --disable-serial disable serial terminal support
591 --enable-serial-speed-simulation
592 @@ -1032,7 +1033,7 @@ esac
593 else
594 echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
595 fi
596 - cd $ac_popdir
597 + cd "$ac_popdir"
598 done
599 fi
601 @@ -2631,8 +2632,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
602 cat conftest.err >&5
603 echo "$as_me:$LINENO: \$? = $ac_status" >&5
604 (exit $ac_status); } &&
605 - { ac_try='test -z "$ac_c_werror_flag"
606 - || test ! -s conftest.err'
607 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
608 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
609 (eval $ac_try) 2>&5
610 ac_status=$?
611 @@ -2690,8 +2690,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
612 cat conftest.err >&5
613 echo "$as_me:$LINENO: \$? = $ac_status" >&5
614 (exit $ac_status); } &&
615 - { ac_try='test -z "$ac_c_werror_flag"
616 - || test ! -s conftest.err'
617 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
618 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
619 (eval $ac_try) 2>&5
620 ac_status=$?
621 @@ -2807,8 +2806,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
622 cat conftest.err >&5
623 echo "$as_me:$LINENO: \$? = $ac_status" >&5
624 (exit $ac_status); } &&
625 - { ac_try='test -z "$ac_c_werror_flag"
626 - || test ! -s conftest.err'
627 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
628 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
629 (eval $ac_try) 2>&5
630 ac_status=$?
631 @@ -2862,8 +2860,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
632 cat conftest.err >&5
633 echo "$as_me:$LINENO: \$? = $ac_status" >&5
634 (exit $ac_status); } &&
635 - { ac_try='test -z "$ac_c_werror_flag"
636 - || test ! -s conftest.err'
637 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
638 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
639 (eval $ac_try) 2>&5
640 ac_status=$?
641 @@ -2908,8 +2905,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
642 cat conftest.err >&5
643 echo "$as_me:$LINENO: \$? = $ac_status" >&5
644 (exit $ac_status); } &&
645 - { ac_try='test -z "$ac_c_werror_flag"
646 - || test ! -s conftest.err'
647 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
648 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
649 (eval $ac_try) 2>&5
650 ac_status=$?
651 @@ -2953,8 +2949,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
652 cat conftest.err >&5
653 echo "$as_me:$LINENO: \$? = $ac_status" >&5
654 (exit $ac_status); } &&
655 - { ac_try='test -z "$ac_c_werror_flag"
656 - || test ! -s conftest.err'
657 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
658 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
659 (eval $ac_try) 2>&5
660 ac_status=$?
661 @@ -3458,8 +3453,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
662 cat conftest.err >&5
663 echo "$as_me:$LINENO: \$? = $ac_status" >&5
664 (exit $ac_status); } &&
665 - { ac_try='test -z "$ac_c_werror_flag"
666 - || test ! -s conftest.err'
667 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
668 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
669 (eval $ac_try) 2>&5
670 ac_status=$?
671 @@ -3523,8 +3517,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
672 cat conftest.err >&5
673 echo "$as_me:$LINENO: \$? = $ac_status" >&5
674 (exit $ac_status); } &&
675 - { ac_try='test -z "$ac_c_werror_flag"
676 - || test ! -s conftest.err'
677 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
678 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
679 (eval $ac_try) 2>&5
680 ac_status=$?
681 @@ -3595,8 +3588,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
682 cat conftest.err >&5
683 echo "$as_me:$LINENO: \$? = $ac_status" >&5
684 (exit $ac_status); } &&
685 - { ac_try='test -z "$ac_c_werror_flag"
686 - || test ! -s conftest.err'
687 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
688 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
689 (eval $ac_try) 2>&5
690 ac_status=$?
691 @@ -3656,8 +3648,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
692 cat conftest.err >&5
693 echo "$as_me:$LINENO: \$? = $ac_status" >&5
694 (exit $ac_status); } &&
695 - { ac_try='test -z "$ac_c_werror_flag"
696 - || test ! -s conftest.err'
697 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
698 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
699 (eval $ac_try) 2>&5
700 ac_status=$?
701 @@ -4095,8 +4086,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
702 cat conftest.err >&5
703 echo "$as_me:$LINENO: \$? = $ac_status" >&5
704 (exit $ac_status); } &&
705 - { ac_try='test -z "$ac_c_werror_flag"
706 - || test ! -s conftest.err'
707 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
708 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
709 (eval $ac_try) 2>&5
710 ac_status=$?
711 @@ -4161,8 +4151,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
712 cat conftest.err >&5
713 echo "$as_me:$LINENO: \$? = $ac_status" >&5
714 (exit $ac_status); } &&
715 - { ac_try='test -z "$ac_c_werror_flag"
716 - || test ! -s conftest.err'
717 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
718 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
719 (eval $ac_try) 2>&5
720 ac_status=$?
721 @@ -4234,8 +4223,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
722 cat conftest.err >&5
723 echo "$as_me:$LINENO: \$? = $ac_status" >&5
724 (exit $ac_status); } &&
725 - { ac_try='test -z "$ac_c_werror_flag"
726 - || test ! -s conftest.err'
727 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
728 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
729 (eval $ac_try) 2>&5
730 ac_status=$?
731 @@ -4300,8 +4288,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
732 cat conftest.err >&5
733 echo "$as_me:$LINENO: \$? = $ac_status" >&5
734 (exit $ac_status); } &&
735 - { ac_try='test -z "$ac_c_werror_flag"
736 - || test ! -s conftest.err'
737 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
738 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
739 (eval $ac_try) 2>&5
740 ac_status=$?
741 @@ -4366,8 +4353,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
742 cat conftest.err >&5
743 echo "$as_me:$LINENO: \$? = $ac_status" >&5
744 (exit $ac_status); } &&
745 - { ac_try='test -z "$ac_c_werror_flag"
746 - || test ! -s conftest.err'
747 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
748 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
749 (eval $ac_try) 2>&5
750 ac_status=$?
751 @@ -4440,8 +4426,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
752 cat conftest.err >&5
753 echo "$as_me:$LINENO: \$? = $ac_status" >&5
754 (exit $ac_status); } &&
755 - { ac_try='test -z "$ac_c_werror_flag"
756 - || test ! -s conftest.err'
757 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
758 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
759 (eval $ac_try) 2>&5
760 ac_status=$?
761 @@ -4506,8 +4491,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
762 cat conftest.err >&5
763 echo "$as_me:$LINENO: \$? = $ac_status" >&5
764 (exit $ac_status); } &&
765 - { ac_try='test -z "$ac_c_werror_flag"
766 - || test ! -s conftest.err'
767 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
768 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
769 (eval $ac_try) 2>&5
770 ac_status=$?
771 @@ -4597,8 +4581,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
772 cat conftest.err >&5
773 echo "$as_me:$LINENO: \$? = $ac_status" >&5
774 (exit $ac_status); } &&
775 - { ac_try='test -z "$ac_c_werror_flag"
776 - || test ! -s conftest.err'
777 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
778 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
779 (eval $ac_try) 2>&5
780 ac_status=$?
781 @@ -4673,8 +4656,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
782 cat conftest.err >&5
783 echo "$as_me:$LINENO: \$? = $ac_status" >&5
784 (exit $ac_status); } &&
785 - { ac_try='test -z "$ac_c_werror_flag"
786 - || test ! -s conftest.err'
787 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
788 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
789 (eval $ac_try) 2>&5
790 ac_status=$?
791 @@ -4745,8 +4727,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
792 cat conftest.err >&5
793 echo "$as_me:$LINENO: \$? = $ac_status" >&5
794 (exit $ac_status); } &&
795 - { ac_try='test -z "$ac_c_werror_flag"
796 - || test ! -s conftest.err'
797 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
798 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
799 (eval $ac_try) 2>&5
800 ac_status=$?
801 @@ -5070,8 +5051,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
802 cat conftest.err >&5
803 echo "$as_me:$LINENO: \$? = $ac_status" >&5
804 (exit $ac_status); } &&
805 - { ac_try='test -z "$ac_c_werror_flag"
806 - || test ! -s conftest.err'
807 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
808 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
809 (eval $ac_try) 2>&5
810 ac_status=$?
811 @@ -5241,8 +5221,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
812 cat conftest.err >&5
813 echo "$as_me:$LINENO: \$? = $ac_status" >&5
814 (exit $ac_status); } &&
815 - { ac_try='test -z "$ac_c_werror_flag"
816 - || test ! -s conftest.err'
817 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
818 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
819 (eval $ac_try) 2>&5
820 ac_status=$?
821 @@ -5313,8 +5292,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
822 cat conftest.err >&5
823 echo "$as_me:$LINENO: \$? = $ac_status" >&5
824 (exit $ac_status); } &&
825 - { ac_try='test -z "$ac_c_werror_flag"
826 - || test ! -s conftest.err'
827 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
828 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
829 (eval $ac_try) 2>&5
830 ac_status=$?
831 @@ -5966,6 +5944,22 @@ else
832 fi
835 +# Check whether --enable-graphics or --disable-graphics was given.
836 +if test "${enable_graphics+set}" = set; then
837 + enableval="$enable_graphics"
838 +
839 +fi;
840 +
841 +
842 +if test "x$enable_graphics" != xno; then
843 + GRAPHICS_SUPPORT_TRUE=
844 + GRAPHICS_SUPPORT_FALSE='#'
845 +else
846 + GRAPHICS_SUPPORT_TRUE='#'
847 + GRAPHICS_SUPPORT_FALSE=
848 +fi
849 +
850 +
851 # Check whether --enable-hercules or --disable-hercules was given.
852 if test "${enable_hercules+set}" = set; then
853 enableval="$enable_hercules"
854 @@ -6270,6 +6264,13 @@ echo "$as_me: error: conditional \"DISKL
855 Usually this means the macro was only invoked conditionally." >&2;}
856 { (exit 1); exit 1; }; }
857 fi
858 +if test -z "${GRAPHICS_SUPPORT_TRUE}" && test -z "${GRAPHICS_SUPPORT_FALSE}"; then
859 + { { echo "$as_me:$LINENO: error: conditional \"GRAPHICS_SUPPORT\" was never defined.
860 +Usually this means the macro was only invoked conditionally." >&5
861 +echo "$as_me: error: conditional \"GRAPHICS_SUPPORT\" was never defined.
862 +Usually this means the macro was only invoked conditionally." >&2;}
863 + { (exit 1); exit 1; }; }
864 +fi
865 if test -z "${HERCULES_SUPPORT_TRUE}" && test -z "${HERCULES_SUPPORT_FALSE}"; then
866 { { echo "$as_me:$LINENO: error: conditional \"HERCULES_SUPPORT\" was never defined.
867 Usually this means the macro was only invoked conditionally." >&5
868 @@ -6907,6 +6908,8 @@ s,@NETBOOT_SUPPORT_TRUE@,$NETBOOT_SUPPOR
869 s,@NETBOOT_SUPPORT_FALSE@,$NETBOOT_SUPPORT_FALSE,;t t
870 s,@DISKLESS_SUPPORT_TRUE@,$DISKLESS_SUPPORT_TRUE,;t t
871 s,@DISKLESS_SUPPORT_FALSE@,$DISKLESS_SUPPORT_FALSE,;t t
872 +s,@GRAPHICS_SUPPORT_TRUE@,$GRAPHICS_SUPPORT_TRUE,;t t
873 +s,@GRAPHICS_SUPPORT_FALSE@,$GRAPHICS_SUPPORT_FALSE,;t t
874 s,@HERCULES_SUPPORT_TRUE@,$HERCULES_SUPPORT_TRUE,;t t
875 s,@HERCULES_SUPPORT_FALSE@,$HERCULES_SUPPORT_FALSE,;t t
876 s,@SERIAL_SUPPORT_TRUE@,$SERIAL_SUPPORT_TRUE,;t t
877 @@ -7088,11 +7091,6 @@ esac
878 *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
879 esac
881 - if test x"$ac_file" != x-; then
882 - { echo "$as_me:$LINENO: creating $ac_file" >&5
883 -echo "$as_me: creating $ac_file" >&6;}
884 - rm -f "$ac_file"
885 - fi
886 # Let's still pretend it is `configure' which instantiates (i.e., don't
887 # use $as_me), people would be surprised to read:
888 # /* config.h. Generated by config.status. */
889 @@ -7131,6 +7129,12 @@ echo "$as_me: error: cannot find input f
890 fi;;
891 esac
892 done` || { (exit 1); exit 1; }
893 +
894 + if test x"$ac_file" != x-; then
895 + { echo "$as_me:$LINENO: creating $ac_file" >&5
896 +echo "$as_me: creating $ac_file" >&6;}
897 + rm -f "$ac_file"
898 + fi
899 _ACEOF
900 cat >>$CONFIG_STATUS <<_ACEOF
901 sed "$ac_vpsub
902 diff -rup grub-0.97.oorig/docs/Makefile.in grub-0.97/docs/Makefile.in
903 --- grub-0.97.oorig/docs/Makefile.in 2005-05-08 04:42:34.000000000 +0200
904 +++ grub-0.97/docs/Makefile.in 2006-03-12 14:00:43.000000000 +0100
905 @@ -1,8 +1,8 @@
906 -# Makefile.in generated by automake 1.9.4 from Makefile.am.
907 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
908 # @configure_input@
910 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
911 -# 2003, 2004 Free Software Foundation, Inc.
912 +# 2003, 2004, 2005 Free Software Foundation, Inc.
913 # This Makefile.in is free software; the Free Software Foundation
914 # gives unlimited permission to copy and/or distribute it,
915 # with or without modifications, as long as this notice is preserved.
916 @@ -15,8 +15,6 @@
917 @SET_MAKE@
920 -SOURCES = $(kernel_SOURCES)
921 -
922 srcdir = @srcdir@
923 top_srcdir = @top_srcdir@
924 VPATH = @srcdir@
925 @@ -120,6 +118,8 @@ ECHO_T = @ECHO_T@
926 EGREP = @EGREP@
927 EXEEXT = @EXEEXT@
928 FSYS_CFLAGS = @FSYS_CFLAGS@
929 +GRAPHICS_SUPPORT_FALSE = @GRAPHICS_SUPPORT_FALSE@
930 +GRAPHICS_SUPPORT_TRUE = @GRAPHICS_SUPPORT_TRUE@
931 GRUB_CFLAGS = @GRUB_CFLAGS@
932 GRUB_LIBS = @GRUB_LIBS@
933 HERCULES_SUPPORT_FALSE = @HERCULES_SUPPORT_FALSE@
934 @@ -304,9 +304,11 @@ kernel-kernel.obj: kernel.c
935 restore=: && backupdir="$(am__leading_dot)am$$$$" && \
936 am__cwd=`pwd` && cd $(srcdir) && \
937 rm -rf $$backupdir && mkdir $$backupdir && \
938 - for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
939 - if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
940 - done; \
941 + if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
942 + for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
943 + if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
944 + done; \
945 + else :; fi && \
946 cd "$$am__cwd"; \
947 if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
948 -o $@ $<; \
949 @@ -371,10 +373,11 @@ multiboot.dvi: multiboot.texi $(multiboo
950 multiboot.pdf: multiboot.texi $(multiboot_TEXINFOS)
951 multiboot.html: multiboot.texi $(multiboot_TEXINFOS)
952 .dvi.ps:
953 + TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
954 $(DVIPS) -o $@ $<
956 uninstall-info-am:
957 - $(PRE_UNINSTALL)
958 + @$(PRE_UNINSTALL)
959 @if (install-info --version && \
960 install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
961 list='$(INFO_DEPS)'; \
962 @@ -390,7 +393,7 @@ uninstall-info-am:
963 relfile=`echo "$$file" | sed 's|^.*/||'`; \
964 relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
965 (if cd "$(DESTDIR)$(infodir)"; then \
966 - echo " rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9])"; \
967 + echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \
968 rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
969 else :; fi); \
970 done
971 @@ -403,10 +406,13 @@ dist-info: $(INFO_DEPS)
972 $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
973 esac; \
974 if test -f $$base; then d=.; else d=$(srcdir); fi; \
975 - for file in $$d/$$base*; do \
976 - relfile=`expr "$$file" : "$$d/\(.*\)"`; \
977 - test -f $(distdir)/$$relfile || \
978 - cp -p $$file $(distdir)/$$relfile; \
979 + base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \
980 + for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \
981 + if test -f $$file; then \
982 + relfile=`expr "$$file" : "$$d/\(.*\)"`; \
983 + test -f $(distdir)/$$relfile || \
984 + cp -p $$file $(distdir)/$$relfile; \
985 + else :; fi; \
986 done; \
987 done
989 diff -rup grub-0.97.oorig/grub/Makefile.in grub-0.97/grub/Makefile.in
990 --- grub-0.97.oorig/grub/Makefile.in 2005-05-08 04:42:34.000000000 +0200
991 +++ grub-0.97/grub/Makefile.in 2006-03-12 14:00:43.000000000 +0100
992 @@ -1,8 +1,8 @@
993 -# Makefile.in generated by automake 1.9.4 from Makefile.am.
994 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
995 # @configure_input@
997 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
998 -# 2003, 2004 Free Software Foundation, Inc.
999 +# 2003, 2004, 2005 Free Software Foundation, Inc.
1000 # This Makefile.in is free software; the Free Software Foundation
1001 # gives unlimited permission to copy and/or distribute it,
1002 # with or without modifications, as long as this notice is preserved.
1003 @@ -14,8 +14,6 @@
1005 @SET_MAKE@
1007 -SOURCES = $(grub_SOURCES)
1008 -
1009 srcdir = @srcdir@
1010 top_srcdir = @top_srcdir@
1011 VPATH = @srcdir@
1012 @@ -97,6 +95,8 @@ ECHO_T = @ECHO_T@
1013 EGREP = @EGREP@
1014 EXEEXT = @EXEEXT@
1015 FSYS_CFLAGS = @FSYS_CFLAGS@
1016 +GRAPHICS_SUPPORT_FALSE = @GRAPHICS_SUPPORT_FALSE@
1017 +GRAPHICS_SUPPORT_TRUE = @GRAPHICS_SUPPORT_TRUE@
1018 GRUB_CFLAGS = @GRUB_CFLAGS@
1019 GRUB_LIBS = @GRUB_LIBS@
1020 HERCULES_SUPPORT_FALSE = @HERCULES_SUPPORT_FALSE@
1021 diff -rup grub-0.97.oorig/lib/Makefile.in grub-0.97/lib/Makefile.in
1022 --- grub-0.97.oorig/lib/Makefile.in 2005-05-08 04:42:35.000000000 +0200
1023 +++ grub-0.97/lib/Makefile.in 2006-03-12 14:00:44.000000000 +0100
1024 @@ -1,8 +1,8 @@
1025 -# Makefile.in generated by automake 1.9.4 from Makefile.am.
1026 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
1027 # @configure_input@
1029 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1030 -# 2003, 2004 Free Software Foundation, Inc.
1031 +# 2003, 2004, 2005 Free Software Foundation, Inc.
1032 # This Makefile.in is free software; the Free Software Foundation
1033 # gives unlimited permission to copy and/or distribute it,
1034 # with or without modifications, as long as this notice is preserved.
1035 @@ -14,8 +14,6 @@
1037 @SET_MAKE@
1039 -SOURCES = $(libcommon_a_SOURCES)
1040 -
1041 srcdir = @srcdir@
1042 top_srcdir = @top_srcdir@
1043 VPATH = @srcdir@
1044 @@ -96,6 +94,8 @@ ECHO_T = @ECHO_T@
1045 EGREP = @EGREP@
1046 EXEEXT = @EXEEXT@
1047 FSYS_CFLAGS = @FSYS_CFLAGS@
1048 +GRAPHICS_SUPPORT_FALSE = @GRAPHICS_SUPPORT_FALSE@
1049 +GRAPHICS_SUPPORT_TRUE = @GRAPHICS_SUPPORT_TRUE@
1050 GRUB_CFLAGS = @GRUB_CFLAGS@
1051 GRUB_LIBS = @GRUB_LIBS@
1052 HERCULES_SUPPORT_FALSE = @HERCULES_SUPPORT_FALSE@
1053 diff -rup grub-0.97.oorig/Makefile.in grub-0.97/Makefile.in
1054 --- grub-0.97.oorig/Makefile.in 2005-05-08 04:42:40.000000000 +0200
1055 +++ grub-0.97/Makefile.in 2006-03-12 14:00:49.000000000 +0100
1056 @@ -1,8 +1,8 @@
1057 -# Makefile.in generated by automake 1.9.4 from Makefile.am.
1058 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
1059 # @configure_input@
1061 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1062 -# 2003, 2004 Free Software Foundation, Inc.
1063 +# 2003, 2004, 2005 Free Software Foundation, Inc.
1064 # This Makefile.in is free software; the Free Software Foundation
1065 # gives unlimited permission to copy and/or distribute it,
1066 # with or without modifications, as long as this notice is preserved.
1067 @@ -101,6 +101,8 @@ ECHO_T = @ECHO_T@
1068 EGREP = @EGREP@
1069 EXEEXT = @EXEEXT@
1070 FSYS_CFLAGS = @FSYS_CFLAGS@
1071 +GRAPHICS_SUPPORT_FALSE = @GRAPHICS_SUPPORT_FALSE@
1072 +GRAPHICS_SUPPORT_TRUE = @GRAPHICS_SUPPORT_TRUE@
1073 GRUB_CFLAGS = @GRUB_CFLAGS@
1074 GRUB_LIBS = @GRUB_LIBS@
1075 HERCULES_SUPPORT_FALSE = @HERCULES_SUPPORT_FALSE@
1076 @@ -250,7 +252,13 @@ uninstall-info-am:
1077 # (which will cause the Makefiles to be regenerated when you run `make');
1078 # (2) otherwise, pass the desired values on the `make' command line.
1079 $(RECURSIVE_TARGETS):
1080 - @set fnord $$MAKEFLAGS; amf=$$2; \
1081 + @failcom='exit 1'; \
1082 + for f in x $$MAKEFLAGS; do \
1083 + case $$f in \
1084 + *=* | --[!k]*);; \
1085 + *k*) failcom='fail=yes';; \
1086 + esac; \
1087 + done; \
1088 dot_seen=no; \
1089 target=`echo $@ | sed s/-recursive//`; \
1090 list='$(SUBDIRS)'; for subdir in $$list; do \
1091 @@ -262,7 +270,7 @@ $(RECURSIVE_TARGETS):
1092 local_target="$$target"; \
1093 fi; \
1094 (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
1095 - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
1096 + || eval $$failcom; \
1097 done; \
1098 if test "$$dot_seen" = "no"; then \
1099 $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
1100 @@ -270,7 +278,13 @@ $(RECURSIVE_TARGETS):
1102 mostlyclean-recursive clean-recursive distclean-recursive \
1103 maintainer-clean-recursive:
1104 - @set fnord $$MAKEFLAGS; amf=$$2; \
1105 + @failcom='exit 1'; \
1106 + for f in x $$MAKEFLAGS; do \
1107 + case $$f in \
1108 + *=* | --[!k]*);; \
1109 + *k*) failcom='fail=yes';; \
1110 + esac; \
1111 + done; \
1112 dot_seen=no; \
1113 case "$@" in \
1114 distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
1115 @@ -291,7 +305,7 @@ maintainer-clean-recursive:
1116 local_target="$$target"; \
1117 fi; \
1118 (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
1119 - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
1120 + || eval $$failcom; \
1121 done && test -z "$$fail"
1122 tags-recursive:
1123 list='$(SUBDIRS)'; for subdir in $$list; do \
1124 diff -rup grub-0.97.oorig/netboot/Makefile.in grub-0.97/netboot/Makefile.in
1125 --- grub-0.97.oorig/netboot/Makefile.in 2005-05-08 04:42:35.000000000 +0200
1126 +++ grub-0.97/netboot/Makefile.in 2006-03-12 14:00:44.000000000 +0100
1127 @@ -1,8 +1,8 @@
1128 -# Makefile.in generated by automake 1.9.4 from Makefile.am.
1129 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
1130 # @configure_input@
1132 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1133 -# 2003, 2004 Free Software Foundation, Inc.
1134 +# 2003, 2004, 2005 Free Software Foundation, Inc.
1135 # This Makefile.in is free software; the Free Software Foundation
1136 # gives unlimited permission to copy and/or distribute it,
1137 # with or without modifications, as long as this notice is preserved.
1138 @@ -14,8 +14,6 @@
1140 @SET_MAKE@
1142 -SOURCES = $(libdrivers_a_SOURCES) $(EXTRA_libdrivers_a_SOURCES)
1143 -
1144 srcdir = @srcdir@
1145 top_srcdir = @top_srcdir@
1146 VPATH = @srcdir@
1147 @@ -97,6 +95,8 @@ ECHO_T = @ECHO_T@
1148 EGREP = @EGREP@
1149 EXEEXT = @EXEEXT@
1150 FSYS_CFLAGS = @FSYS_CFLAGS@
1151 +GRAPHICS_SUPPORT_FALSE = @GRAPHICS_SUPPORT_FALSE@
1152 +GRAPHICS_SUPPORT_TRUE = @GRAPHICS_SUPPORT_TRUE@
1153 GRUB_CFLAGS = @GRUB_CFLAGS@
1154 GRUB_LIBS = @GRUB_LIBS@
1155 HERCULES_SUPPORT_FALSE = @HERCULES_SUPPORT_FALSE@
1156 diff -rup grub-0.97.oorig/stage1/Makefile.in grub-0.97/stage1/Makefile.in
1157 --- grub-0.97.oorig/stage1/Makefile.in 2005-05-08 04:42:36.000000000 +0200
1158 +++ grub-0.97/stage1/Makefile.in 2006-03-12 14:00:45.000000000 +0100
1159 @@ -1,8 +1,8 @@
1160 -# Makefile.in generated by automake 1.9.4 from Makefile.am.
1161 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
1162 # @configure_input@
1164 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1165 -# 2003, 2004 Free Software Foundation, Inc.
1166 +# 2003, 2004, 2005 Free Software Foundation, Inc.
1167 # This Makefile.in is free software; the Free Software Foundation
1168 # gives unlimited permission to copy and/or distribute it,
1169 # with or without modifications, as long as this notice is preserved.
1170 @@ -15,8 +15,6 @@
1171 @SET_MAKE@
1174 -SOURCES = $(stage1_exec_SOURCES)
1175 -
1176 srcdir = @srcdir@
1177 top_srcdir = @top_srcdir@
1178 VPATH = @srcdir@
1179 @@ -102,6 +100,8 @@ ECHO_T = @ECHO_T@
1180 EGREP = @EGREP@
1181 EXEEXT = @EXEEXT@
1182 FSYS_CFLAGS = @FSYS_CFLAGS@
1183 +GRAPHICS_SUPPORT_FALSE = @GRAPHICS_SUPPORT_FALSE@
1184 +GRAPHICS_SUPPORT_TRUE = @GRAPHICS_SUPPORT_TRUE@
1185 GRUB_CFLAGS = @GRUB_CFLAGS@
1186 GRUB_LIBS = @GRUB_LIBS@
1187 HERCULES_SUPPORT_FALSE = @HERCULES_SUPPORT_FALSE@
1188 diff -rup grub-0.97.oorig/stage2/Makefile.in grub-0.97/stage2/Makefile.in
1189 --- grub-0.97.oorig/stage2/Makefile.in 2005-05-08 04:42:39.000000000 +0200
1190 +++ grub-0.97/stage2/Makefile.in 2006-03-12 14:00:48.000000000 +0100
1191 @@ -1,8 +1,8 @@
1192 -# Makefile.in generated by automake 1.9.4 from Makefile.am.
1193 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
1194 # @configure_input@
1196 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1197 -# 2003, 2004 Free Software Foundation, Inc.
1198 +# 2003, 2004, 2005 Free Software Foundation, Inc.
1199 # This Makefile.in is free software; the Free Software Foundation
1200 # gives unlimited permission to copy and/or distribute it,
1201 # with or without modifications, as long as this notice is preserved.
1202 @@ -18,8 +18,6 @@
1206 -SOURCES = $(libgrub_a_SOURCES) $(diskless_exec_SOURCES) $(e2fs_stage1_5_exec_SOURCES) $(fat_stage1_5_exec_SOURCES) $(ffs_stage1_5_exec_SOURCES) $(iso9660_stage1_5_exec_SOURCES) $(jfs_stage1_5_exec_SOURCES) $(minix_stage1_5_exec_SOURCES) $(nbloader_exec_SOURCES) $(pre_stage2_exec_SOURCES) $(pxeloader_exec_SOURCES) $(reiserfs_stage1_5_exec_SOURCES) $(start_exec_SOURCES) $(start_eltorito_exec_SOURCES) $(ufs2_stage1_5_exec_SOURCES) $(vstafs_stage1_5_exec_SOURCES) $(xfs_stage1_5_exec_SOURCES)
1207 -
1208 srcdir = @srcdir@
1209 top_srcdir = @top_srcdir@
1210 VPATH = @srcdir@
1211 @@ -100,7 +98,7 @@ am_libgrub_a_OBJECTS = libgrub_a-boot.$(
1212 libgrub_a-fsys_xfs.$(OBJEXT) libgrub_a-gunzip.$(OBJEXT) \
1213 libgrub_a-md5.$(OBJEXT) libgrub_a-serial.$(OBJEXT) \
1214 libgrub_a-stage2.$(OBJEXT) libgrub_a-terminfo.$(OBJEXT) \
1215 - libgrub_a-tparm.$(OBJEXT)
1216 + libgrub_a-tparm.$(OBJEXT) libgrub_a-graphics.$(OBJEXT)
1217 libgrub_a_OBJECTS = $(am_libgrub_a_OBJECTS)
1218 PROGRAMS = $(noinst_PROGRAMS)
1219 am__objects_1 = diskless_exec-asm.$(OBJEXT) \
1220 @@ -125,7 +123,8 @@ am__objects_1 = diskless_exec-asm.$(OBJE
1221 diskless_exec-serial.$(OBJEXT) \
1222 diskless_exec-smp-imps.$(OBJEXT) \
1223 diskless_exec-stage2.$(OBJEXT) \
1224 - diskless_exec-terminfo.$(OBJEXT) diskless_exec-tparm.$(OBJEXT)
1225 + diskless_exec-terminfo.$(OBJEXT) diskless_exec-tparm.$(OBJEXT) \
1226 + diskless_exec-graphics.$(OBJEXT)
1227 am_diskless_exec_OBJECTS = $(am__objects_1)
1228 diskless_exec_OBJECTS = $(am_diskless_exec_OBJECTS)
1229 diskless_exec_DEPENDENCIES = ../netboot/libdrivers.a
1230 @@ -217,7 +216,8 @@ am_pre_stage2_exec_OBJECTS = pre_stage2_
1231 pre_stage2_exec-smp-imps.$(OBJEXT) \
1232 pre_stage2_exec-stage2.$(OBJEXT) \
1233 pre_stage2_exec-terminfo.$(OBJEXT) \
1234 - pre_stage2_exec-tparm.$(OBJEXT)
1235 + pre_stage2_exec-tparm.$(OBJEXT) \
1236 + pre_stage2_exec-graphics.$(OBJEXT)
1237 pre_stage2_exec_OBJECTS = $(am_pre_stage2_exec_OBJECTS)
1238 @NETBOOT_SUPPORT_TRUE@pre_stage2_exec_DEPENDENCIES = \
1239 @NETBOOT_SUPPORT_TRUE@ ../netboot/libdrivers.a
1240 @@ -344,6 +344,8 @@ ECHO_T = @ECHO_T@
1241 EGREP = @EGREP@
1242 EXEEXT = @EXEEXT@
1243 FSYS_CFLAGS = @FSYS_CFLAGS@
1244 +GRAPHICS_SUPPORT_FALSE = @GRAPHICS_SUPPORT_FALSE@
1245 +GRAPHICS_SUPPORT_TRUE = @GRAPHICS_SUPPORT_TRUE@
1246 GRUB_CFLAGS = @GRUB_CFLAGS@
1247 GRUB_LIBS = @GRUB_LIBS@
1248 HERCULES_SUPPORT_FALSE = @HERCULES_SUPPORT_FALSE@
1249 @@ -435,7 +437,7 @@ noinst_HEADERS = apic.h defs.h dir.h dis
1250 fat.h filesys.h freebsd.h fs.h hercules.h i386-elf.h \
1251 imgact_aout.h iso9660.h jfs.h mb_header.h mb_info.h md5.h \
1252 nbi.h pc_slice.h serial.h shared.h smp-imps.h term.h \
1253 - terminfo.h tparm.h nbi.h ufs2.h vstafs.h xfs.h
1254 + terminfo.h tparm.h nbi.h ufs2.h vstafs.h xfs.h graphics.h
1256 EXTRA_DIST = setjmp.S apm.S $(noinst_SCRIPTS)
1258 @@ -448,7 +450,7 @@ libgrub_a_SOURCES = boot.c builtins.c ch
1259 disk_io.c fsys_ext2fs.c fsys_fat.c fsys_ffs.c fsys_iso9660.c \
1260 fsys_jfs.c fsys_minix.c fsys_reiserfs.c fsys_ufs2.c \
1261 fsys_vstafs.c fsys_xfs.c gunzip.c md5.c serial.c stage2.c \
1262 - terminfo.c tparm.c
1263 + terminfo.c tparm.c graphics.c
1265 libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
1266 -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
1267 @@ -479,8 +481,10 @@ START_ELTORITO_LINK = -nostdlib -Wl,-N -
1268 @SERIAL_SUPPORT_TRUE@SERIAL_FLAGS = -DSUPPORT_SERIAL=1
1269 @HERCULES_SUPPORT_FALSE@HERCULES_FLAGS =
1270 @HERCULES_SUPPORT_TRUE@HERCULES_FLAGS = -DSUPPORT_HERCULES=1
1271 +@GRAPHICS_SUPPORT_FALSE@GRAPHICS_FLAGS =
1272 +@GRAPHICS_SUPPORT_TRUE@GRAPHICS_FLAGS = -DSUPPORT_GRAPHICS=1
1273 STAGE2_COMPILE = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
1274 - $(NETBOOT_FLAGS) $(SERIAL_FLAGS) $(HERCULES_FLAGS)
1275 + $(NETBOOT_FLAGS) $(SERIAL_FLAGS) $(HERCULES_FLAGS) $(GRAPHICS_FLAGS)
1277 STAGE1_5_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,2000
1278 STAGE1_5_COMPILE = $(STAGE2_COMPILE) -DNO_DECOMPRESSION=1 -DSTAGE1_5=1
1279 @@ -490,7 +494,8 @@ pre_stage2_exec_SOURCES = asm.S bios.c b
1280 cmdline.c common.c console.c disk_io.c fsys_ext2fs.c \
1281 fsys_fat.c fsys_ffs.c fsys_iso9660.c fsys_jfs.c fsys_minix.c \
1282 fsys_reiserfs.c fsys_ufs2.c fsys_vstafs.c fsys_xfs.c gunzip.c \
1283 - hercules.c md5.c serial.c smp-imps.c stage2.c terminfo.c tparm.c
1284 + hercules.c md5.c serial.c smp-imps.c stage2.c terminfo.c tparm.c \
1285 + graphics.c
1287 pre_stage2_exec_CFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
1288 pre_stage2_exec_CCASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
1289 @@ -766,6 +771,7 @@ distclean-compile:
1290 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diskless_exec-fsys_ufs2.Po@am__quote@
1291 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diskless_exec-fsys_vstafs.Po@am__quote@
1292 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diskless_exec-fsys_xfs.Po@am__quote@
1293 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diskless_exec-graphics.Po@am__quote@
1294 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diskless_exec-gunzip.Po@am__quote@
1295 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diskless_exec-hercules.Po@am__quote@
1296 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diskless_exec-md5.Po@am__quote@
1297 @@ -820,6 +826,7 @@ distclean-compile:
1298 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgrub_a-fsys_ufs2.Po@am__quote@
1299 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgrub_a-fsys_vstafs.Po@am__quote@
1300 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgrub_a-fsys_xfs.Po@am__quote@
1301 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgrub_a-graphics.Po@am__quote@
1302 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgrub_a-gunzip.Po@am__quote@
1303 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgrub_a-md5.Po@am__quote@
1304 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgrub_a-serial.Po@am__quote@
1305 @@ -850,6 +857,7 @@ distclean-compile:
1306 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pre_stage2_exec-fsys_ufs2.Po@am__quote@
1307 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pre_stage2_exec-fsys_vstafs.Po@am__quote@
1308 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pre_stage2_exec-fsys_xfs.Po@am__quote@
1309 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pre_stage2_exec-graphics.Po@am__quote@
1310 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pre_stage2_exec-gunzip.Po@am__quote@
1311 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pre_stage2_exec-hercules.Po@am__quote@
1312 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pre_stage2_exec-md5.Po@am__quote@
1313 @@ -1367,6 +1375,20 @@ libgrub_a-tparm.obj: tparm.c
1314 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1315 @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgrub_a_CFLAGS) $(CFLAGS) -c -o libgrub_a-tparm.obj `if test -f 'tparm.c'; then $(CYGPATH_W) 'tparm.c'; else $(CYGPATH_W) '$(srcdir)/tparm.c'; fi`
1317 +libgrub_a-graphics.o: graphics.c
1318 +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgrub_a_CFLAGS) $(CFLAGS) -MT libgrub_a-graphics.o -MD -MP -MF "$(DEPDIR)/libgrub_a-graphics.Tpo" -c -o libgrub_a-graphics.o `test -f 'graphics.c' || echo '$(srcdir)/'`graphics.c; \
1319 +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgrub_a-graphics.Tpo" "$(DEPDIR)/libgrub_a-graphics.Po"; else rm -f "$(DEPDIR)/libgrub_a-graphics.Tpo"; exit 1; fi
1320 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='graphics.c' object='libgrub_a-graphics.o' libtool=no @AMDEPBACKSLASH@
1321 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1322 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgrub_a_CFLAGS) $(CFLAGS) -c -o libgrub_a-graphics.o `test -f 'graphics.c' || echo '$(srcdir)/'`graphics.c
1323 +
1324 +libgrub_a-graphics.obj: graphics.c
1325 +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgrub_a_CFLAGS) $(CFLAGS) -MT libgrub_a-graphics.obj -MD -MP -MF "$(DEPDIR)/libgrub_a-graphics.Tpo" -c -o libgrub_a-graphics.obj `if test -f 'graphics.c'; then $(CYGPATH_W) 'graphics.c'; else $(CYGPATH_W) '$(srcdir)/graphics.c'; fi`; \
1326 +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgrub_a-graphics.Tpo" "$(DEPDIR)/libgrub_a-graphics.Po"; else rm -f "$(DEPDIR)/libgrub_a-graphics.Tpo"; exit 1; fi
1327 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='graphics.c' object='libgrub_a-graphics.obj' libtool=no @AMDEPBACKSLASH@
1328 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1329 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgrub_a_CFLAGS) $(CFLAGS) -c -o libgrub_a-graphics.obj `if test -f 'graphics.c'; then $(CYGPATH_W) 'graphics.c'; else $(CYGPATH_W) '$(srcdir)/graphics.c'; fi`
1330 +
1331 diskless_exec-bios.o: bios.c
1332 @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(diskless_exec_CFLAGS) $(CFLAGS) -MT diskless_exec-bios.o -MD -MP -MF "$(DEPDIR)/diskless_exec-bios.Tpo" -c -o diskless_exec-bios.o `test -f 'bios.c' || echo '$(srcdir)/'`bios.c; \
1333 @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/diskless_exec-bios.Tpo" "$(DEPDIR)/diskless_exec-bios.Po"; else rm -f "$(DEPDIR)/diskless_exec-bios.Tpo"; exit 1; fi
1334 @@ -1731,6 +1753,20 @@ diskless_exec-tparm.obj: tparm.c
1335 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1336 @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(diskless_exec_CFLAGS) $(CFLAGS) -c -o diskless_exec-tparm.obj `if test -f 'tparm.c'; then $(CYGPATH_W) 'tparm.c'; else $(CYGPATH_W) '$(srcdir)/tparm.c'; fi`
1338 +diskless_exec-graphics.o: graphics.c
1339 +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(diskless_exec_CFLAGS) $(CFLAGS) -MT diskless_exec-graphics.o -MD -MP -MF "$(DEPDIR)/diskless_exec-graphics.Tpo" -c -o diskless_exec-graphics.o `test -f 'graphics.c' || echo '$(srcdir)/'`graphics.c; \
1340 +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/diskless_exec-graphics.Tpo" "$(DEPDIR)/diskless_exec-graphics.Po"; else rm -f "$(DEPDIR)/diskless_exec-graphics.Tpo"; exit 1; fi
1341 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='graphics.c' object='diskless_exec-graphics.o' libtool=no @AMDEPBACKSLASH@
1342 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1343 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(diskless_exec_CFLAGS) $(CFLAGS) -c -o diskless_exec-graphics.o `test -f 'graphics.c' || echo '$(srcdir)/'`graphics.c
1344 +
1345 +diskless_exec-graphics.obj: graphics.c
1346 +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(diskless_exec_CFLAGS) $(CFLAGS) -MT diskless_exec-graphics.obj -MD -MP -MF "$(DEPDIR)/diskless_exec-graphics.Tpo" -c -o diskless_exec-graphics.obj `if test -f 'graphics.c'; then $(CYGPATH_W) 'graphics.c'; else $(CYGPATH_W) '$(srcdir)/graphics.c'; fi`; \
1347 +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/diskless_exec-graphics.Tpo" "$(DEPDIR)/diskless_exec-graphics.Po"; else rm -f "$(DEPDIR)/diskless_exec-graphics.Tpo"; exit 1; fi
1348 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='graphics.c' object='diskless_exec-graphics.obj' libtool=no @AMDEPBACKSLASH@
1349 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1350 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(diskless_exec_CFLAGS) $(CFLAGS) -c -o diskless_exec-graphics.obj `if test -f 'graphics.c'; then $(CYGPATH_W) 'graphics.c'; else $(CYGPATH_W) '$(srcdir)/graphics.c'; fi`
1351 +
1352 e2fs_stage1_5_exec-common.o: common.c
1353 @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(e2fs_stage1_5_exec_CFLAGS) $(CFLAGS) -MT e2fs_stage1_5_exec-common.o -MD -MP -MF "$(DEPDIR)/e2fs_stage1_5_exec-common.Tpo" -c -o e2fs_stage1_5_exec-common.o `test -f 'common.c' || echo '$(srcdir)/'`common.c; \
1354 @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/e2fs_stage1_5_exec-common.Tpo" "$(DEPDIR)/e2fs_stage1_5_exec-common.Po"; else rm -f "$(DEPDIR)/e2fs_stage1_5_exec-common.Tpo"; exit 1; fi
1355 @@ -2599,6 +2635,20 @@ pre_stage2_exec-tparm.obj: tparm.c
1356 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1357 @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pre_stage2_exec_CFLAGS) $(CFLAGS) -c -o pre_stage2_exec-tparm.obj `if test -f 'tparm.c'; then $(CYGPATH_W) 'tparm.c'; else $(CYGPATH_W) '$(srcdir)/tparm.c'; fi`
1359 +pre_stage2_exec-graphics.o: graphics.c
1360 +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pre_stage2_exec_CFLAGS) $(CFLAGS) -MT pre_stage2_exec-graphics.o -MD -MP -MF "$(DEPDIR)/pre_stage2_exec-graphics.Tpo" -c -o pre_stage2_exec-graphics.o `test -f 'graphics.c' || echo '$(srcdir)/'`graphics.c; \
1361 +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/pre_stage2_exec-graphics.Tpo" "$(DEPDIR)/pre_stage2_exec-graphics.Po"; else rm -f "$(DEPDIR)/pre_stage2_exec-graphics.Tpo"; exit 1; fi
1362 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='graphics.c' object='pre_stage2_exec-graphics.o' libtool=no @AMDEPBACKSLASH@
1363 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1364 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pre_stage2_exec_CFLAGS) $(CFLAGS) -c -o pre_stage2_exec-graphics.o `test -f 'graphics.c' || echo '$(srcdir)/'`graphics.c
1365 +
1366 +pre_stage2_exec-graphics.obj: graphics.c
1367 +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pre_stage2_exec_CFLAGS) $(CFLAGS) -MT pre_stage2_exec-graphics.obj -MD -MP -MF "$(DEPDIR)/pre_stage2_exec-graphics.Tpo" -c -o pre_stage2_exec-graphics.obj `if test -f 'graphics.c'; then $(CYGPATH_W) 'graphics.c'; else $(CYGPATH_W) '$(srcdir)/graphics.c'; fi`; \
1368 +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/pre_stage2_exec-graphics.Tpo" "$(DEPDIR)/pre_stage2_exec-graphics.Po"; else rm -f "$(DEPDIR)/pre_stage2_exec-graphics.Tpo"; exit 1; fi
1369 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='graphics.c' object='pre_stage2_exec-graphics.obj' libtool=no @AMDEPBACKSLASH@
1370 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1371 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pre_stage2_exec_CFLAGS) $(CFLAGS) -c -o pre_stage2_exec-graphics.obj `if test -f 'graphics.c'; then $(CYGPATH_W) 'graphics.c'; else $(CYGPATH_W) '$(srcdir)/graphics.c'; fi`
1372 +
1373 reiserfs_stage1_5_exec-common.o: common.c
1374 @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(reiserfs_stage1_5_exec_CFLAGS) $(CFLAGS) -MT reiserfs_stage1_5_exec-common.o -MD -MP -MF "$(DEPDIR)/reiserfs_stage1_5_exec-common.Tpo" -c -o reiserfs_stage1_5_exec-common.o `test -f 'common.c' || echo '$(srcdir)/'`common.c; \
1375 @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/reiserfs_stage1_5_exec-common.Tpo" "$(DEPDIR)/reiserfs_stage1_5_exec-common.Po"; else rm -f "$(DEPDIR)/reiserfs_stage1_5_exec-common.Tpo"; exit 1; fi
1376 diff -rup grub-0.97.oorig/util/Makefile.in grub-0.97/util/Makefile.in
1377 --- grub-0.97.oorig/util/Makefile.in 2005-05-08 04:42:39.000000000 +0200
1378 +++ grub-0.97/util/Makefile.in 2006-03-12 14:00:48.000000000 +0100
1379 @@ -1,8 +1,8 @@
1380 -# Makefile.in generated by automake 1.9.4 from Makefile.am.
1381 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
1382 # @configure_input@
1384 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1385 -# 2003, 2004 Free Software Foundation, Inc.
1386 +# 2003, 2004, 2005 Free Software Foundation, Inc.
1387 # This Makefile.in is free software; the Free Software Foundation
1388 # gives unlimited permission to copy and/or distribute it,
1389 # with or without modifications, as long as this notice is preserved.
1390 @@ -15,8 +15,6 @@
1391 @SET_MAKE@
1394 -SOURCES = $(mbchk_SOURCES)
1395 -
1396 srcdir = @srcdir@
1397 top_srcdir = @top_srcdir@
1398 VPATH = @srcdir@
1399 @@ -102,6 +100,8 @@ ECHO_T = @ECHO_T@
1400 EGREP = @EGREP@
1401 EXEEXT = @EXEEXT@
1402 FSYS_CFLAGS = @FSYS_CFLAGS@
1403 +GRAPHICS_SUPPORT_FALSE = @GRAPHICS_SUPPORT_FALSE@
1404 +GRAPHICS_SUPPORT_TRUE = @GRAPHICS_SUPPORT_TRUE@
1405 GRUB_CFLAGS = @GRUB_CFLAGS@
1406 GRUB_LIBS = @GRUB_LIBS@
1407 HERCULES_SUPPORT_FALSE = @HERCULES_SUPPORT_FALSE@