1 --- chromium-bsu-0.9.14/configure.ac~ 2009-09-22 09:42:08.173550200 +0200
2 +++ chromium-bsu-0.9.14/configure.ac 2009-09-22 09:44:35.873535456 +0200
6 if test "x$TEXT_TYPE" = xGLC -a "x$FONT_NAME" != x ; then
7 - TEXT_CFLAGS+=" -DFONT_NAME=\"\\\"$FONT_NAME\\\"\""
8 + TEXT_CFLAGS="$TEXT_CFLAGS -DFONT_NAME=\"\\\"$FONT_NAME\\\"\""
11 elif test "x$TEXT_TYPE" = xGLC ; then
15 if test "x$TEXT_TYPE" = xFTGL -a "x$FONT_PATH" != x ; then
16 - TEXT_CFLAGS+=" -DFONT_PATH=\"\\\"$FONT_PATH\\\"\""
17 + TEXT_CFLAGS="$TEXT_CFLAGS -DFONT_PATH=\"\\\"$FONT_PATH\\\"\""
22 if test "x$TEXT_TYPE" = xFTGL -a "x$HAVE_FONTCONFIG" = xyes ; then
23 AC_DEFINE(HAVE_FONTCONFIG, 1, [define to use fontconfig])
24 - TEXT_CFLAGS+=" $FONTCONFIG_CFLAGS"
25 + TEXT_CFLAGS="$TEXT_CFLAGS $FONTCONFIG_CFLAGS"
27 - TEXT_LIBS+=" $FONTCONFIG_LIBS"
28 + TEXT_LIBS="$TEXT_LIBS $FONTCONFIG_LIBS"
30 - FONT+="fontconfig (bold Gothic Uralic) "
31 + FONT="$FONT fontconfig (bold Gothic Uralic) "
34 if test "x$TEXT_TYPE" = xFTGL -a "x$HAVE_FONTCONFIG" != xyes -a "x$FONT_PATH" = x ; then
37 if test "x$HAVE_SDLIMAGE" = xyes -a "x$WINDOW_TYPE" = xSDL -a "x$enable_sdlimage" != xno; then
38 AC_DEFINE(ENABLE_WINDOW_ICON, 1, [define to enable the window icon (needs SDL_image)])
39 - WINDOW_LIBS+=-lSDL_image
40 + WINDOW_LIBS="$WINDOW_LIBS -lSDL_image"