mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

fixed configure/configure.in for new cairo-features.h.in

This commit is contained in:
vladimir%pobox.com 2006-01-10 23:32:12 +00:00
Родитель f482cc5ae4
Коммит f9bd080315
2 изменённых файлов: 17 добавлений и 13 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

25
configure поставляемый
Просмотреть файл

@ -19021,6 +19021,7 @@ EOF
if test "$_WIN32_MSVC"; then if test "$_WIN32_MSVC"; then
MOZ_CAIRO_LIBS='$(DIST)/lib/mozcairo.lib $(DIST)/lib/mozlibpixman.lib' MOZ_CAIRO_LIBS='$(DIST)/lib/mozcairo.lib $(DIST)/lib/mozlibpixman.lib'
@ -19055,7 +19056,7 @@ EOF
# Extract the first word of "pkg-config", so it can be a program name with args. # Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2 set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:19059: checking for $ac_word" >&5 echo "configure:19060: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -19099,19 +19100,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0 PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6 echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6
echo "configure:19103: checking for cairo >= $CAIRO_VERSION" >&5 echo "configure:19104: checking for cairo >= $CAIRO_VERSION" >&5
if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
succeeded=yes succeeded=yes
echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6 echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6
echo "configure:19110: checking CAIRO_CFLAGS" >&5 echo "configure:19111: checking CAIRO_CFLAGS" >&5
CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION"` CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION"`
echo "$ac_t""$CAIRO_CFLAGS" 1>&6 echo "$ac_t""$CAIRO_CFLAGS" 1>&6
echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6 echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6
echo "configure:19115: checking CAIRO_LIBS" >&5 echo "configure:19116: checking CAIRO_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic ## Remove evil flags like -Wl,--export-dynamic
CAIRO_LIBS="`$PKG_CONFIG --libs \"cairo >= $CAIRO_VERSION\" |sed s/-Wl,--export-dynamic//g`" CAIRO_LIBS="`$PKG_CONFIG --libs \"cairo >= $CAIRO_VERSION\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$CAIRO_LIBS" 1>&6 echo "$ac_t""$CAIRO_LIBS" 1>&6
@ -19175,7 +19176,7 @@ if test `echo "$MOZ_EXTENSIONS" | grep -c python/xpcom` -ne 0; then
# Extract the first word of "python", so it can be a program name with args. # Extract the first word of "python", so it can be a program name with args.
set dummy python; ac_word=$2 set dummy python; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:19179: checking for $ac_word" >&5 echo "configure:19180: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -19437,14 +19438,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
cross_compiling=$ac_cv_prog_cc_cross cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 19441 "configure" #line 19442 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <gmodule.h> #include <gmodule.h>
int main() { int main() {
int x = 1; x++; int x = 1; x++;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:19448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:19449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
: :
else else
echo "configure: failed program was:" >&5 echo "configure: failed program was:" >&5
@ -19748,7 +19749,7 @@ if test "$MOZ_X11"; then
_SAVE_CFLAGS=$CFLAGS _SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $XCFLAGS" CFLAGS="$CFLAGS $XCFLAGS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 19752 "configure" #line 19753 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
@ -19764,7 +19765,7 @@ int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:19768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:19769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
: :
else else
echo "configure: failed program was:" >&5 echo "configure: failed program was:" >&5
@ -20343,16 +20344,18 @@ s%@MOZ_LIBART_CFLAGS@%$MOZ_LIBART_CFLAGS%g
s%@MOZ_LIBART_LIBS@%$MOZ_LIBART_LIBS%g s%@MOZ_LIBART_LIBS@%$MOZ_LIBART_LIBS%g
s%@PS_SURFACE_FEATURE@%$PS_SURFACE_FEATURE%g s%@PS_SURFACE_FEATURE@%$PS_SURFACE_FEATURE%g
s%@PDF_SURFACE_FEATURE@%$PDF_SURFACE_FEATURE%g s%@PDF_SURFACE_FEATURE@%$PDF_SURFACE_FEATURE%g
s%@PNG_FUNCTIONS_FEATURE@%$PNG_FUNCTIONS_FEATURE%g s%@SVG_SURFACE_FEATURE@%$SVG_SURFACE_FEATURE%g
s%@XLIB_SURFACE_FEATURE@%$XLIB_SURFACE_FEATURE%g s%@XLIB_SURFACE_FEATURE@%$XLIB_SURFACE_FEATURE%g
s%@QUARTZ_SURFACE_FEATURE@%$QUARTZ_SURFACE_FEATURE%g s%@QUARTZ_SURFACE_FEATURE@%$QUARTZ_SURFACE_FEATURE%g
s%@XCB_SURFACE_FEATURE@%$XCB_SURFACE_FEATURE%g s%@XCB_SURFACE_FEATURE@%$XCB_SURFACE_FEATURE%g
s%@WIN32_SURFACE_FEATURE@%$WIN32_SURFACE_FEATURE%g s%@WIN32_SURFACE_FEATURE@%$WIN32_SURFACE_FEATURE%g
s%@BEOS_SURFACE_FEATURE@%$BEOS_SURFACE_FEATURE%g
s%@GLITZ_SURFACE_FEATURE@%$GLITZ_SURFACE_FEATURE%g s%@GLITZ_SURFACE_FEATURE@%$GLITZ_SURFACE_FEATURE%g
s%@DIRECTFB_SURFACE_FEATURE@%$DIRECTFB_SURFACE_FEATURE%g
s%@FT_FONT_FEATURE@%$FT_FONT_FEATURE%g s%@FT_FONT_FEATURE@%$FT_FONT_FEATURE%g
s%@WIN32_FONT_FEATURE@%$WIN32_FONT_FEATURE%g s%@WIN32_FONT_FEATURE@%$WIN32_FONT_FEATURE%g
s%@ATSUI_FONT_FEATURE@%$ATSUI_FONT_FEATURE%g s%@ATSUI_FONT_FEATURE@%$ATSUI_FONT_FEATURE%g
s%@SANITY_CHECKING_FEATURE@%$SANITY_CHECKING_FEATURE%g s%@PNG_FUNCTIONS_FEATURE@%$PNG_FUNCTIONS_FEATURE%g
s%@CAIRO_CFLAGS@%$CAIRO_CFLAGS%g s%@CAIRO_CFLAGS@%$CAIRO_CFLAGS%g
s%@CAIRO_LIBS@%$CAIRO_LIBS%g s%@CAIRO_LIBS@%$CAIRO_LIBS%g
s%@MOZ_TREE_CAIRO@%$MOZ_TREE_CAIRO%g s%@MOZ_TREE_CAIRO@%$MOZ_TREE_CAIRO%g

5
configure.in
Просмотреть файл

@ -6604,17 +6604,18 @@ if test "$MOZ_SVG_RENDERER_CAIRO" -o "$MOZ_ENABLE_CANVAS" -o "$MOZ_ENABLE_CAIRO_
AC_SUBST(PS_SURFACE_FEATURE) AC_SUBST(PS_SURFACE_FEATURE)
AC_SUBST(PDF_SURFACE_FEATURE) AC_SUBST(PDF_SURFACE_FEATURE)
AC_SUBST(PNG_FUNCTIONS_FEATURE) AC_SUBST(SVG_SURFACE_FEATURE)
AC_SUBST(XLIB_SURFACE_FEATURE) AC_SUBST(XLIB_SURFACE_FEATURE)
AC_SUBST(QUARTZ_SURFACE_FEATURE) AC_SUBST(QUARTZ_SURFACE_FEATURE)
AC_SUBST(XCB_SURFACE_FEATURE) AC_SUBST(XCB_SURFACE_FEATURE)
AC_SUBST(WIN32_SURFACE_FEATURE) AC_SUBST(WIN32_SURFACE_FEATURE)
AC_SUBST(BEOS_SURFACE_FEATURE)
AC_SUBST(GLITZ_SURFACE_FEATURE) AC_SUBST(GLITZ_SURFACE_FEATURE)
AC_SUBST(DIRECTFB_SURFACE_FEATURE)
AC_SUBST(FT_FONT_FEATURE) AC_SUBST(FT_FONT_FEATURE)
AC_SUBST(WIN32_FONT_FEATURE) AC_SUBST(WIN32_FONT_FEATURE)
AC_SUBST(ATSUI_FONT_FEATURE) AC_SUBST(ATSUI_FONT_FEATURE)
AC_SUBST(PNG_FUNCTIONS_FEATURE) AC_SUBST(PNG_FUNCTIONS_FEATURE)
AC_SUBST(SANITY_CHECKING_FEATURE)
if test "$_WIN32_MSVC"; then if test "$_WIN32_MSVC"; then
MOZ_CAIRO_LIBS='$(DIST)/lib/mozcairo.lib $(DIST)/lib/mozlibpixman.lib' MOZ_CAIRO_LIBS='$(DIST)/lib/mozcairo.lib $(DIST)/lib/mozlibpixman.lib'