vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2008-08-09 Christian Franke <franke@computer.org>

Browse source 
* Makefile.in: Add `target_os' and `enable_grub_pe2elf'.
	* conf/common.rmk: Install `grub-pe2elf' only if requested.
	Install `grub.d/10_windows' only on Cygwin.
	* configure.ac: Add subst of `target_os'.
	Check `target_os' also before setting TARGET_OBJ2ELF.
	Add `--enable-grub-pe2elf'.
This commit is contained in:
chrfranke 2008-08-09 12:30:26 +00:00
parent 042bd419da
commit 2d05bc6a3e
6 changed files with 54 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
configure vendored
View file

@ -702,6 +702,7 @@ MODULE_LDFLAGS
LIBCURSES
enable_grub_emu
enable_grub_fstest
enable_grub_pe2elf
LIBOBJS
LTLIBOBJS'
ac_subst_files=''
@ -1300,6 +1301,8 @@ Optional Features:
--enable-grub-emu build and install the `grub-emu' debugging utility
--enable-grub-fstest build and install the `grub-fstest' debugging
utility
--enable-grub-pe2elf build and install the `grub-pe2elf' conversion
utility
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@ -1993,6 +1996,7 @@ esac
#
# Checks for build programs.
#
@ -5901,9 +5905,10 @@ echo "${ECHO_T}$TARGET_IMG_LDFLAGS_AC" >&6; }
# For platforms where ELF is not the default link format.
{ echo "$as_me:$LINENO: checking for command to convert module to ELF format" >&5
echo $ECHO_N "checking for command to convert module to ELF format... $ECHO_C" >&6; }
if test "$host_os" = cygwin; then
TARGET_OBJ2ELF='grub-pe2elf.exe'
fi
case "${host_os}:${target_os}" in
cygwin:cygwin) TARGET_OBJ2ELF='grub-pe2elf' ;;
*) ;;
esac
{ echo "$as_me:$LINENO: result: $TARGET_OBJ2ELF" >&5
echo "${ECHO_T}$TARGET_OBJ2ELF" >&6; }
@ -8363,6 +8368,13 @@ fi
# Check whether --enable-grub-pe2elf was given.
if test "${enable_grub_pe2elf+set}" = set; then
enableval=$enable_grub_pe2elf;
fi
# Output files.
ac_config_links="$ac_config_links include/grub/cpu:include/grub/$target_cpu include/grub/machine:include/grub/$target_cpu/$platform"
@ -9083,11 +9095,12 @@ MODULE_LDFLAGS!$MODULE_LDFLAGS$ac_delim
LIBCURSES!$LIBCURSES$ac_delim
enable_grub_emu!$enable_grub_emu$ac_delim
enable_grub_fstest!$enable_grub_fstest$ac_delim
enable_grub_pe2elf!$enable_grub_pe2elf$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5