mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 12:25:53 +00:00
Automated update from host egg
This commit is contained in:
cltbld
parent
397f2c6e63
commit
88da2a6700
72
configure
vendored
72
configure
vendored
@ -17224,20 +17224,21 @@ if test -z "$MACOSX"; then
|
||||
fi;
|
||||
|
||||
if test "$MOZ_SVG_RENDERER_CAIRO" -o "$MOZ_ENABLE_CAIRO" ; then
|
||||
MOZ_TREE_CAIRO=1
|
||||
# Check whether --enable-system-cairo or --disable-system-cairo was given.
|
||||
if test "${enable_system_cairo+set}" = set; then
|
||||
enableval="$enable_system_cairo"
|
||||
if test "$enableval" = "yes"; then
|
||||
MOZ_SYSTEM_CAIRO=1
|
||||
MOZ_TREE_CAIRO=
|
||||
elif test "$enableval" = "no"; then
|
||||
MOZ_SYSTEM_CAIRO=
|
||||
MOZ_TREE_CAIRO=1
|
||||
else
|
||||
{ echo "configure: error: Option, system-cairo, does not take an argument ($enableval)." 1>&2; exit 1; }
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
if test "$MOZ_SYSTEM_CAIRO"; then
|
||||
if test -z "$MOZ_TREE_CAIRO"; then
|
||||
|
||||
succeeded=no
|
||||
|
||||
@ -17245,7 +17246,7 @@ fi
|
||||
# Extract the first word of "pkg-config", so it can be a program name with args.
|
||||
set dummy pkg-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:17249: checking for $ac_word" >&5
|
||||
echo "configure:17250: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -17289,19 +17290,19 @@ fi
|
||||
PKG_CONFIG_MIN_VERSION=0.9.0
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
|
||||
echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6
|
||||
echo "configure:17293: checking for cairo >= $CAIRO_VERSION" >&5
|
||||
echo "configure:17294: checking for cairo >= $CAIRO_VERSION" >&5
|
||||
|
||||
if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
succeeded=yes
|
||||
|
||||
echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6
|
||||
echo "configure:17300: checking CAIRO_CFLAGS" >&5
|
||||
echo "configure:17301: checking CAIRO_CFLAGS" >&5
|
||||
CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION"`
|
||||
echo "$ac_t""$CAIRO_CFLAGS" 1>&6
|
||||
|
||||
echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6
|
||||
echo "configure:17305: checking CAIRO_LIBS" >&5
|
||||
echo "configure:17306: checking CAIRO_LIBS" >&5
|
||||
## don't use --libs since that can do evil things like add
|
||||
## -Wl,--export-dynamic
|
||||
CAIRO_LIBS="`$PKG_CONFIG --libs-only-L \"cairo >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo >= $CAIRO_VERSION\"`"
|
||||
@ -17557,14 +17558,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
|
||||
cross_compiling=$ac_cv_prog_cc_cross
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 17561 "configure"
|
||||
#line 17562 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <gmodule.h>
|
||||
int main() {
|
||||
int x = 1; x++;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:17568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:17569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
:
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
@ -17849,7 +17850,7 @@ if test -n "$MOZ_X11"; then
|
||||
_SAVE_CFLAGS=$CFLAGS
|
||||
CFLAGS="$CFLAGS $XCFLAGS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 17853 "configure"
|
||||
#line 17854 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdio.h>
|
||||
@ -17865,7 +17866,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:17869: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:17870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
:
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
@ -18436,7 +18437,7 @@ s%@MOZ_LIBART_CFLAGS@%$MOZ_LIBART_CFLAGS%g
|
||||
s%@MOZ_LIBART_LIBS@%$MOZ_LIBART_LIBS%g
|
||||
s%@CAIRO_CFLAGS@%$CAIRO_CFLAGS%g
|
||||
s%@CAIRO_LIBS@%$CAIRO_LIBS%g
|
||||
s%@MOZ_SYSTEM_CAIRO@%$MOZ_SYSTEM_CAIRO%g
|
||||
s%@MOZ_TREE_CAIRO@%$MOZ_TREE_CAIRO%g
|
||||
s%@MOZ_CAIRO_CFLAGS@%$MOZ_CAIRO_CFLAGS%g
|
||||
s%@MOZ_CAIRO_LIBS@%$MOZ_CAIRO_LIBS%g
|
||||
s%@MOZ_XUL@%$MOZ_XUL%g
|
||||
@ -19126,23 +19127,22 @@ fi
|
||||
ac_configure_args="$_SUBDIR_CONFIG_ARGS"
|
||||
fi
|
||||
|
||||
if test "$MOZ_SVG_RENDERER_CAIRO" -o "$MOZ_ENABLE_CAIRO" ; then
|
||||
if test -z "$MOZ_SYSTEM_CAIRO"; then
|
||||
# these subdirs may not yet have been created in the build tree.
|
||||
# don't use the "-p" switch to mkdir, since not all platforms have it
|
||||
#
|
||||
if test ! -d "gfx/cairo"; then
|
||||
mkdir "gfx/cairo"
|
||||
fi
|
||||
if test ! -d "gfx/cairo/libpixman"; then
|
||||
mkdir "gfx/cairo/libpixman"
|
||||
fi
|
||||
if test ! -d "gfx/cairo/cairo"; then
|
||||
mkdir "gfx/cairo/cairo"
|
||||
fi
|
||||
if test "$MOZ_TREE_CAIRO"; then
|
||||
# these subdirs may not yet have been created in the build tree.
|
||||
# don't use the "-p" switch to mkdir, since not all platforms have it
|
||||
#
|
||||
if test ! -d "gfx/cairo"; then
|
||||
mkdir "gfx/cairo"
|
||||
fi
|
||||
if test ! -d "gfx/cairo/libpixman"; then
|
||||
mkdir "gfx/cairo/libpixman"
|
||||
fi
|
||||
if test ! -d "gfx/cairo/cairo"; then
|
||||
mkdir "gfx/cairo/cairo"
|
||||
fi
|
||||
|
||||
ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --includedir=$MOZ_BUILD_ROOT/dist/include/cairo"
|
||||
|
||||
ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --includedir=$MOZ_BUILD_ROOT/dist/include/cairo"
|
||||
|
||||
if test "$no_recursion" != yes; then
|
||||
|
||||
# Remove --cache-file and --srcdir arguments so they do not pile up.
|
||||
@ -19241,14 +19241,13 @@ if test "$no_recursion" != yes; then
|
||||
fi
|
||||
|
||||
|
||||
export PKG_CONFIG_PATH=$MOZ_BUILD_ROOT/gfx/cairo/libpixman
|
||||
ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --disable-ps --disable-pdf --disable-png --disable-glitz --disable-xcb"
|
||||
export PKG_CONFIG_PATH=$MOZ_BUILD_ROOT/gfx/cairo/libpixman
|
||||
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
|
||||
ac_configure_args="$ac_configure_args --disable-freetype --disable-xlib"
|
||||
fi
|
||||
|
||||
if test -n "$MACOSX"; then
|
||||
ac_configure_args="$ac_configure_args --disable-freetype --disable-xlib"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if test "$no_recursion" != yes; then
|
||||
|
||||
# Remove --cache-file and --srcdir arguments so they do not pile up.
|
||||
@ -19346,6 +19345,5 @@ if test "$no_recursion" != yes; then
|
||||
done
|
||||
fi
|
||||
|
||||
ac_configure_args="$_SUBDIR_CONFIG_ARGS"
|
||||
fi
|
||||
ac_configure_args="$_SUBDIR_CONFIG_ARGS"
|
||||
fi
|
||||
|
||||
Loading…
Reference in New Issue
Block a user