Attachment #29085 for bug #46410

Lines 207-212 Link Here

(-)grub-0.94/INSTALL (+3 lines)
207	`--disable-reiserfs'	207	`--disable-reiserfs'
208	Omit the ReiserFS support in Stage 2.	208	Omit the ReiserFS support in Stage 2.
209		209
		210	`--disable-reiser4'
		211	Omit the Reiser4 support in Stage 2.
		212
210	`--disable-vstafs'	213	`--disable-vstafs'
211	Omit the VSTa filesystem support in Stage 2.	214	Omit the VSTa filesystem support in Stage 2.
212		215

Lines 50-55 Link Here

(-)grub-0.94/config.h.in (+6 lines)
50	/* Define to 1 if you have the <inttypes.h> header file. */	50	/* Define to 1 if you have the <inttypes.h> header file. */
51	#undef HAVE_INTTYPES_H	51	#undef HAVE_INTTYPES_H
52		52
		53	/* Define to 1 if you have the `aal-alone' library (-laal-alone). */
		54	#undef HAVE_LIBAAL_ALONE
		55
		56	/* Define to 1 if you have the `reiser4-alone' library (-lreiser4-alone). */
		57	#undef HAVE_LIBREISER4_ALONE
		58
53	/* Define to 1 if you have the <memory.h> header file. */	59	/* Define to 1 if you have the <memory.h> header file. */
54	#undef HAVE_MEMORY_H	60	#undef HAVE_MEMORY_H
55		61




  FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_REISERFS=1"
fi

dnl Checking for reiser4
REISER4_LIBS=""
REISER4_CFLAGS=""

OLD_LIBS=$LIBS
OLD_CFLAGS=$CFLAGS
LIBS=""
CFLAGS=""

AC_ARG_ENABLE(reiser4,
  [  --disable-reiser4       disable Reiser4 support in Stage 2])

enable_reiser4_support=yes
 
AC_CHECK_LIB(aal-alone, aal_mem_init, , 
  AC_MSG_WARN(
Reiser4 support is disabled due to inability find libaal-alone with 
memory manager support turned on.)
  enable_reiser4_support=no
)

if test x"$enable_reiser4_support" != xno; then
  AC_CHECK_HEADER(aal/libaal.h, ,
  AC_MSG_WARN(
Libaal header files are not found. Reiser4 support is disabled
  )
  enable_reiser4_support=no)
fi
  
if test x"$enable_reiser4_support" != xno; then
  AC_CHECK_LIB(reiser4-alone, reiser4_fs_open, , 
  AC_MSG_WARN(
Reiser4 support is disabled due to inability find valid libreiser4-alone.)
    enable_reiser4_support=no, 
    -laal-alone
  )
fi

if test x"$enable_reiser4_support" != xno; then
  AC_CHECK_HEADER(reiser4/libreiser4.h, ,
  AC_MSG_WARN(
Reiser4 header files are not found. Reiser4 support is disabled.
  )
  enable_reiser4_support=no)
fi

if test x"$enable_reiser4_support" != xno; then
  REISER4_CFLAGS="$REISER4_CFLAGS -DFSYS_REISER4=1"
  REISER4_LIBS=$LIBS
fi

if test x"$enable_reiser4_support" != xno; then
  AC_CHECK_LIB(reiser4-alone, __sym40_plug_init, 
    REISER4_CFLAGS="$REISER4_CFLAGS -DENABLE_SYMLINKS=1",
AC_MSG_WARN(Reiser4 symlinks support is disabled.), 
    -laal-alone
  )
fi

LIBS=$OLD_LIBS
CFLAGS=$OLD_CFLAGS

if test x"$enable_reiser4" != xno; then
  (test x"$enable_reiser4_support" != xno) &&
    FSYS_CFLAGS="$FSYS_CFLAGS $REISER4_CFLAGS"
fi

AC_SUBST(REISER4_LIBS)
AC_SUBST(REISER4_CFLAGS)
AM_CONDITIONAL(ENABLE_REISER4_SUPPORT, test x"$enable_reiser4_support" != xno)

AC_ARG_ENABLE(vstafs,
  [  --disable-vstafs        disable VSTa FS support in Stage 2])

Return to bug 46410

Lines 241-246 Link Here

(-)grub-0.94/configure.ac (+71 lines)
241	FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_REISERFS=1"	241	FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_REISERFS=1"
242	fi	242	fi
243		243
		244	dnl Checking for reiser4
		245	REISER4_LIBS=""
		246	REISER4_CFLAGS=""
		247
		248	OLD_LIBS=$LIBS
		249	OLD_CFLAGS=$CFLAGS
		250	LIBS=""
		251	CFLAGS=""
		252
		253	AC_ARG_ENABLE(reiser4,
		254	[ --disable-reiser4 disable Reiser4 support in Stage 2])
		255
		256	enable_reiser4_support=yes
		257
		258	AC_CHECK_LIB(aal-alone, aal_mem_init, ,
		259	AC_MSG_WARN(
		260	Reiser4 support is disabled due to inability find libaal-alone with
		261	memory manager support turned on.)
		262	enable_reiser4_support=no
		263	)
		264
		265	if test x"$enable_reiser4_support" != xno; then
		266	AC_CHECK_HEADER(aal/libaal.h, ,
		267	AC_MSG_WARN(
		268	Libaal header files are not found. Reiser4 support is disabled
		269	)
		270	enable_reiser4_support=no)
		271	fi
		272
		273	if test x"$enable_reiser4_support" != xno; then
		274	AC_CHECK_LIB(reiser4-alone, reiser4_fs_open, ,
		275	AC_MSG_WARN(
		276	Reiser4 support is disabled due to inability find valid libreiser4-alone.)
		277	enable_reiser4_support=no,
		278	-laal-alone
		279	)
		280	fi
		281
		282	if test x"$enable_reiser4_support" != xno; then
		283	AC_CHECK_HEADER(reiser4/libreiser4.h, ,
		284	AC_MSG_WARN(
		285	Reiser4 header files are not found. Reiser4 support is disabled.
		286	)
		287	enable_reiser4_support=no)
		288	fi
		289
		290	if test x"$enable_reiser4_support" != xno; then
		291	REISER4_CFLAGS="$REISER4_CFLAGS -DFSYS_REISER4=1"
		292	REISER4_LIBS=$LIBS
		293	fi
		294
		295	if test x"$enable_reiser4_support" != xno; then
		296	AC_CHECK_LIB(reiser4-alone, __sym40_plug_init,
		297	REISER4_CFLAGS="$REISER4_CFLAGS -DENABLE_SYMLINKS=1",
		298	AC_MSG_WARN(Reiser4 symlinks support is disabled.),
		299	-laal-alone
		300	)
		301	fi
		302
		303	LIBS=$OLD_LIBS
		304	CFLAGS=$OLD_CFLAGS
		305
		306	if test x"$enable_reiser4" != xno; then
		307	(test x"$enable_reiser4_support" != xno) &&
308	FSYS_CFLAGS="$FSYS_CFLAGS $REISER4_CFLAGS"
309	fi
310
311	AC_SUBST(REISER4_LIBS)
312	AC_SUBST(REISER4_CFLAGS)
313	AM_CONDITIONAL(ENABLE_REISER4_SUPPORT, test x"$enable_reiser4_support" != xno)
314
244	AC_ARG_ENABLE(vstafs,	315	AC_ARG_ENABLE(vstafs,
245	[ --disable-vstafs disable VSTa FS support in Stage 2])	316	[ --disable-vstafs disable VSTa FS support in Stage 2])