Attachment #12945 for bug #22447

Lines 109-116 Link Here

(-)./grub-0.92-old/configure.in (-2 / +2 lines)
109	CPPFLAGS=$saved_CPPFLAGS	109	CPPFLAGS=$saved_CPPFLAGS
110	])	110	])
111		111
112	# Force no alignment to save space.	112	# save space.
113	CPPFLAGS="$CPPFLAGS -falign-jumps=1 -falign-loops=1 -falign-functions=1"	113	CPPFLAGS="$CPPFLAGS -O2 -Os"
114		114
115	if test "x$undef_flag" = xyes; then	115	if test "x$undef_flag" = xyes; then
116	CPPFLAGS="$CPPFLAGS -Wundef"	116	CPPFLAGS="$CPPFLAGS -Wundef"




_AM_DEPENDENCIES(CC)

dnl Because recent automake complains about AS, set it here.
CCAS="$CC"
AC_SUBST(CCAS)

AC_ARG_WITH(binutils,
  [  --with-binutils=DIR     search the directory DIR to find binutils])

])

# Force no alignment to save space.
CPPFLAGS="$CPPFLAGS -falign-jumps=1 -falign-loops=1 -falign-functions=1"

if test "x$undef_flag" = xyes; then
  CPPFLAGS="$CPPFLAGS -Wundef"


# Unless the user specify --without-curses, check for curses.
if test "x$with_curses" != "xno"; then
  AC_CHECK_LIB(ncurses, wgetch, [GRUB_LIBS="$GRUB_LIBS /usr/lib/libncurses.a"
  AC_DEFINE(HAVE_LIBCURSES)],
    [AC_CHECK_LIB(curses, wgetch, [GRUB_LIBS="$GRUB_LIBS /usr/lib/libncurses.a"
       AC_DEFINE(HAVE_LIBCURSES)])])
fi


AC_SUBST(NET_EXTRAFLAGS)
AC_SUBST(NETBOOT_DRIVERS)

dnl Because recent automake complains about CCASFLAGS, set it here.
CCASFLAGS='$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)'
AC_SUBST(CCASFLAGS)

AC_ARG_ENABLE(vga16,
  [  --disable-vga16        disable VGA graphics interface])

Lines 53-60 Link Here

(-)./grub-0.92-old/stage2/fsys_jfs.c (-2 / +2 lines)
53	#define dtroot ((dtroot_t *)(&inode->di_btroot))	53	#define dtroot ((dtroot_t *)(&inode->di_btroot))
54		54
55	static ldtentry_t de_always[2] = {	55	static ldtentry_t de_always[2] = {
56	{1, -1, 2, {'.', '.'}},	56	{1, -1, 2, {'.', '.'}, 0},
57	{1, -1, 1, {'.'}}	57	{1, -1, 1, {'.'}, 0}
58	};	58	};
59		59
60	static int	60	static int

Lines 112-118 Link Here

(-)./grub-0.92-old/stage2/fsys_reiserfs.c (-1 / +1 lines)
112	/* offset in the log of where to start replay after a crash */	112	/* offset in the log of where to start replay after a crash */
113	__u32 j_first_unflushed_offset;	113	__u32 j_first_unflushed_offset;
114	/* mount id to detect very old transactions */	114	/* mount id to detect very old transactions */
115	__u32 long j_mount_id;	115	__u32 j_mount_id;
116	};	116	};
117		117
118	/* magic string to find desc blocks in the journal */	118	/* magic string to find desc blocks in the journal */

Return to bug 22447

Lines 55-62 Link Here

(-)./grub-0.92-old/configure.in~ (-8 / +8 lines)
55	_AM_DEPENDENCIES(CC)	55	_AM_DEPENDENCIES(CC)
56		56
57	dnl Because recent automake complains about AS, set it here.	57	dnl Because recent automake complains about AS, set it here.
58	AS="$CC"	58	CCAS="$CC"
59	AC_SUBST(AS)	59	AC_SUBST(CCAS)
60		60
61	AC_ARG_WITH(binutils,	61	AC_ARG_WITH(binutils,
62	[ --with-binutils=DIR search the directory DIR to find binutils])	62	[ --with-binutils=DIR search the directory DIR to find binutils])
Lines 110-116 Link Here
110	])	110	])
111		111
112	# Force no alignment to save space.	112	# Force no alignment to save space.
113	CPPFLAGS="$CPPFLAGS -malign-jumps=1 -malign-loops=1 -malign-functions=1"	113	CPPFLAGS="$CPPFLAGS -falign-jumps=1 -falign-loops=1 -falign-functions=1"
114		114
115	if test "x$undef_flag" = xyes; then	115	if test "x$undef_flag" = xyes; then
116	CPPFLAGS="$CPPFLAGS -Wundef"	116	CPPFLAGS="$CPPFLAGS -Wundef"
Lines 173-181 Link Here
173		173
174	# Unless the user specify --without-curses, check for curses.	174	# Unless the user specify --without-curses, check for curses.
175	if test "x$with_curses" != "xno"; then	175	if test "x$with_curses" != "xno"; then
176	AC_CHECK_LIB(ncurses, wgetch, [GRUB_LIBS="$GRUB_LIBS -lncurses"	176	AC_CHECK_LIB(ncurses, wgetch, [GRUB_LIBS="$GRUB_LIBS /usr/lib/libncurses.a"
177	AC_DEFINE(HAVE_LIBCURSES)],	177	AC_DEFINE(HAVE_LIBCURSES)],
178	[AC_CHECK_LIB(curses, wgetch, [GRUB_LIBS="$GRUB_LIBS -lcurses"	178	[AC_CHECK_LIB(curses, wgetch, [GRUB_LIBS="$GRUB_LIBS /usr/lib/libncurses.a"
179	AC_DEFINE(HAVE_LIBCURSES)])])	179	AC_DEFINE(HAVE_LIBCURSES)])])
180	fi	180	fi
181		181
Lines 607-615 Link Here
607	AC_SUBST(NET_EXTRAFLAGS)	607	AC_SUBST(NET_EXTRAFLAGS)
608	AC_SUBST(NETBOOT_DRIVERS)	608	AC_SUBST(NETBOOT_DRIVERS)
609		609
610	dnl Because recent automake complains about ASFLAGS, set it here.	610	dnl Because recent automake complains about CCASFLAGS, set it here.
611	ASFLAGS='$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)'	611	CCASFLAGS='$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)'
612	AC_SUBST(ASFLAGS)	612	AC_SUBST(CCASFLAGS)
613		613
614	AC_ARG_ENABLE(vga16,	614	AC_ARG_ENABLE(vga16,
615	[ --disable-vga16 disable VGA graphics interface])	615	[ --disable-vga16 disable VGA graphics interface])