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

* configure.ac: Set CPP to build one when checkoing for freetype for

Browse source 
build.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-08-22 18:56:00 +02:00
parent 506b336b82
commit b224c26627
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-08-22 Vladimir Serbinenko <phcoder@gmail.com>
* configure.ac: Set CPP to build one when checkoing for freetype for
build.
2013-08-22 Vladimir Serbinenko <phcoder@gmail.com> 2013-08-22 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-mkfont.c [!GRUB_BUILD]: Define my_argp_state. * util/grub-mkfont.c [!GRUB_BUILD]: Define my_argp_state.

4
configure.ac
View file

@ -395,6 +395,7 @@ fi
HOST_CC=$CC HOST_CC=$CC
AC_CHECK_PROGS(BUILD_CC, [gcc egcs cc]) AC_CHECK_PROGS(BUILD_CC, [gcc egcs cc])
test -z "$BUILD_CC" && AC_MSG_ERROR([none of gcc, egcs and cc is found. set BUILD_CC manually.]) test -z "$BUILD_CC" && AC_MSG_ERROR([none of gcc, egcs and cc is found. set BUILD_CC manually.])
BUILD_CPP="$BUILD_CC -E"
# For gnulib. # For gnulib.
gl_INIT gl_INIT
@ -990,9 +991,11 @@ AC_SUBST([freetype_cflags])
AC_SUBST([freetype_libs]) AC_SUBST([freetype_libs])
SAVED_CC="$CC" SAVED_CC="$CC"
SAVED_CPP="$CPP"
SAVED_CFLAGS="$CFLAGS" SAVED_CFLAGS="$CFLAGS"
SAVED_CPPFLAGS="$CPPFLAGS" SAVED_CPPFLAGS="$CPPFLAGS"
CC="$BUILD_CC" CC="$BUILD_CC"
CPP="$BUILD_CPP"
CFLAGS="$BUILD_CFLAGS" CFLAGS="$BUILD_CFLAGS"
CPPFLAGS="$BUILD_CPPFLAGS" CPPFLAGS="$BUILD_CPPFLAGS"
@ -1046,6 +1049,7 @@ AC_SUBST([build_freetype_cflags])
AC_SUBST([build_freetype_libs]) AC_SUBST([build_freetype_libs])
CC="$SAVED_CC" CC="$SAVED_CC"
CPP="$SAVED_CPP"
CFLAGS="$SAVED_CFLAGS" CFLAGS="$SAVED_CFLAGS"
CPPFLAGS="$SAVED_CPPFLAGS" CPPFLAGS="$SAVED_CPPFLAGS"