зеркало из https://github.com/mozilla/pjs.git
Bug 286980 - cairo config should add to PKG_CONFIG_PATH, not replace. r=cls
This commit is contained in:
Родитель
3a1fc4546b
Коммит
67db76745b
|
@ -6469,7 +6469,7 @@ if test "$MOZ_TREE_CAIRO"; then
|
||||||
AC_OUTPUT_SUBDIRS(gfx/cairo/libpixman)
|
AC_OUTPUT_SUBDIRS(gfx/cairo/libpixman)
|
||||||
|
|
||||||
PKG_CONFIG_PATH=$MOZ_BUILD_ROOT/gfx/cairo/libpixman:$PKG_CONFIG_PATH
|
PKG_CONFIG_PATH=$MOZ_BUILD_ROOT/gfx/cairo/libpixman:$PKG_CONFIG_PATH
|
||||||
export $PKG_CONFIG_PATH
|
export PKG_CONFIG_PATH
|
||||||
ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --disable-ps --disable-pdf --disable-png --disable-glitz --disable-xcb"
|
ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --disable-ps --disable-pdf --disable-png --disable-glitz --disable-xcb"
|
||||||
if test -n "$MACOSX"; then
|
if test -n "$MACOSX"; then
|
||||||
ac_configure_args="$ac_configure_args --disable-freetype --disable-xlib"
|
ac_configure_args="$ac_configure_args --disable-freetype --disable-xlib"
|
||||||
|
|
Загрузка…
Ссылка в новой задаче