mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-03 12:35:58 +00:00
Automated update from host egg.build.mozilla.org
This commit is contained in:
parent
5033ec7891
commit
fc6d6a05de
27
configure
vendored
27
configure
vendored
@ -20145,6 +20145,7 @@ EOF
|
||||
if test "$MOZ_WIDGET_TOOLKIT" = "windows"; then
|
||||
WIN32_SURFACE_FEATURE="#define CAIRO_HAS_WIN32_SURFACE 1"
|
||||
WIN32_FONT_FEATURE="#define CAIRO_HAS_WIN32_FONT 1"
|
||||
PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1"
|
||||
fi
|
||||
if test "$MOZ_WIDGET_TOOLKIT" = "os2"; then
|
||||
OS2_SURFACE_FEATURE="#define CAIRO_HAS_OS2_SURFACE 1"
|
||||
@ -20163,7 +20164,7 @@ EOF
|
||||
# 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:20167: checking for $ac_word" >&5
|
||||
echo "configure:20168: 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
|
||||
@ -20207,19 +20208,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 fontconfig freetype2""... $ac_c" 1>&6
|
||||
echo "configure:20211: checking for fontconfig freetype2" >&5
|
||||
echo "configure:20212: checking for fontconfig freetype2" >&5
|
||||
|
||||
if $PKG_CONFIG --exists "fontconfig freetype2" ; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
succeeded=yes
|
||||
|
||||
echo $ac_n "checking CAIRO_FT_CFLAGS""... $ac_c" 1>&6
|
||||
echo "configure:20218: checking CAIRO_FT_CFLAGS" >&5
|
||||
echo "configure:20219: checking CAIRO_FT_CFLAGS" >&5
|
||||
CAIRO_FT_CFLAGS=`$PKG_CONFIG --cflags "fontconfig freetype2"`
|
||||
echo "$ac_t""$CAIRO_FT_CFLAGS" 1>&6
|
||||
|
||||
echo $ac_n "checking CAIRO_FT_LIBS""... $ac_c" 1>&6
|
||||
echo "configure:20223: checking CAIRO_FT_LIBS" >&5
|
||||
echo "configure:20224: checking CAIRO_FT_LIBS" >&5
|
||||
## Remove evil flags like -Wl,--export-dynamic
|
||||
CAIRO_FT_LIBS="`$PKG_CONFIG --libs \"fontconfig freetype2\" |sed s/-Wl,--export-dynamic//g`"
|
||||
echo "$ac_t""$CAIRO_FT_LIBS" 1>&6
|
||||
@ -20307,7 +20308,7 @@ echo "configure:20223: checking CAIRO_FT_LIBS" >&5
|
||||
# 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:20311: checking for $ac_word" >&5
|
||||
echo "configure:20312: 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
|
||||
@ -20351,19 +20352,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 freetype2 fontconfig""... $ac_c" 1>&6
|
||||
echo "configure:20355: checking for cairo >= $CAIRO_VERSION freetype2 fontconfig" >&5
|
||||
echo "configure:20356: checking for cairo >= $CAIRO_VERSION freetype2 fontconfig" >&5
|
||||
|
||||
if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION freetype2 fontconfig" ; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
succeeded=yes
|
||||
|
||||
echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6
|
||||
echo "configure:20362: checking CAIRO_CFLAGS" >&5
|
||||
echo "configure:20363: checking CAIRO_CFLAGS" >&5
|
||||
CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION freetype2 fontconfig"`
|
||||
echo "$ac_t""$CAIRO_CFLAGS" 1>&6
|
||||
|
||||
echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6
|
||||
echo "configure:20367: checking CAIRO_LIBS" >&5
|
||||
echo "configure:20368: checking CAIRO_LIBS" >&5
|
||||
## Remove evil flags like -Wl,--export-dynamic
|
||||
CAIRO_LIBS="`$PKG_CONFIG --libs \"cairo >= $CAIRO_VERSION freetype2 fontconfig\" |sed s/-Wl,--export-dynamic//g`"
|
||||
echo "$ac_t""$CAIRO_LIBS" 1>&6
|
||||
@ -20427,7 +20428,7 @@ if test `echo "$MOZ_EXTENSIONS" | grep -c python` -ne 0; then
|
||||
# Extract the first word of "python", so it can be a program name with args.
|
||||
set dummy python; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:20431: checking for $ac_word" >&5
|
||||
echo "configure:20432: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -20754,14 +20755,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 20758 "configure"
|
||||
#line 20759 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <gmodule.h>
|
||||
int main() {
|
||||
int x = 1; x++;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:20765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:20766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
:
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
@ -21072,7 +21073,7 @@ if test "$MOZ_X11"; then
|
||||
_SAVE_CFLAGS=$CFLAGS
|
||||
CFLAGS="$CFLAGS $XCFLAGS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 21076 "configure"
|
||||
#line 21077 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdio.h>
|
||||
@ -21089,7 +21090,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:21093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:21094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
:
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
|
Loading…
x
Reference in New Issue
Block a user