From d0c0b41278ea71af8015bbd393fb3d4cbe3bb63f Mon Sep 17 00:00:00 2001 From: "vladimir%pobox.com" Date: Sat, 14 Oct 2006 04:46:04 +0000 Subject: [PATCH] b=351561, fix thebes/cairo linking issues git-svn-id: svn://10.0.0.236/trunk@213633 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/browser/app/Makefile.in | 3 + mozilla/configure | 160 ++++++++++--------- mozilla/configure.in | 5 +- mozilla/gfx/cairo/cairo/src/cairo-platform.h | 62 +++---- mozilla/gfx/src/thebes/Makefile.in | 4 + mozilla/gfx/thebes/public/gfxTypes.h | 8 +- mozilla/gfx/thebes/src/Makefile.in | 8 +- mozilla/layout/build/Makefile.in | 15 +- 8 files changed, 129 insertions(+), 136 deletions(-) diff --git a/mozilla/browser/app/Makefile.in b/mozilla/browser/app/Makefile.in index c03e65dc817..4ac8e2ed7b7 100644 --- a/mozilla/browser/app/Makefile.in +++ b/mozilla/browser/app/Makefile.in @@ -175,6 +175,9 @@ ifeq ($(OS_ARCH),WINNT) OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool) ifdef MOZ_ENABLE_CAIRO_GFX OS_LIBS += $(call EXPAND_LIBNAME,usp10) +ifdef MOZ_ENABLE_GLITZ +OS_LIBS += $(call EXPAND_LIBNAME,opengl32) +endif endif RCINCLUDE = splash.rc diff --git a/mozilla/configure b/mozilla/configure index 3bda073622e..b5e237009d1 100755 --- a/mozilla/configure +++ b/mozilla/configure @@ -17491,6 +17491,12 @@ if test -n "$MOZ_ENABLE_LIBXUL"; then EOF else + if test -n "$BUILD_STATIC_LIBS"; then + cat >> confdefs.h <<\EOF +#define MOZ_STATIC_BUILD 1 +EOF + + fi XPCOM_LIBS="$DYNAMIC_XPCOM_LIBS" fi @@ -17585,7 +17591,7 @@ then # 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:17589: checking for $ac_word" >&5 +echo "configure:17595: 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 @@ -17629,19 +17635,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 libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0""... $ac_c" 1>&6 -echo "configure:17633: checking for libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0" >&5 +echo "configure:17639: checking for libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0" >&5 if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6 -echo "configure:17640: checking LIBIDL_CFLAGS" >&5 +echo "configure:17646: checking LIBIDL_CFLAGS" >&5 LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0"` echo "$ac_t""$LIBIDL_CFLAGS" 1>&6 echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6 -echo "configure:17645: checking LIBIDL_LIBS" >&5 +echo "configure:17651: checking LIBIDL_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic LIBIDL_LIBS="`$PKG_CONFIG --libs \"libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$LIBIDL_LIBS" 1>&6 @@ -17763,7 +17769,7 @@ fi # Extract the first word of "glib-config", so it can be a program name with args. set dummy glib-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:17767: checking for $ac_word" >&5 +echo "configure:17773: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -17798,7 +17804,7 @@ fi min_glib_version=1.2.0 echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 -echo "configure:17802: checking for GLIB - version >= $min_glib_version" >&5 +echo "configure:17808: checking for GLIB - version >= $min_glib_version" >&5 no_glib="" if test "$GLIB_CONFIG" = "no" ; then no_glib=yes @@ -17821,7 +17827,7 @@ echo "configure:17802: checking for GLIB - version >= $min_glib_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -17897,7 +17903,7 @@ main () } EOF -if { (eval echo configure:17901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:17907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -17931,7 +17937,7 @@ fi CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" cat > conftest.$ac_ext < @@ -17941,7 +17947,7 @@ int main() { return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ; return 0; } EOF -if { (eval echo configure:17945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GLIB or finding the wrong" @@ -17985,7 +17991,7 @@ rm -f conftest* # Extract the first word of "libIDL-config", so it can be a program name with args. set dummy libIDL-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:17989: checking for $ac_word" >&5 +echo "configure:17995: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -18020,7 +18026,7 @@ fi min_libIDL_version=$LIBIDL_VERSION echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 -echo "configure:18024: checking for libIDL - version >= $min_libIDL_version" >&5 +echo "configure:18030: checking for libIDL - version >= $min_libIDL_version" >&5 no_libIDL="" if test "$LIBIDL_CONFIG" = "no" ; then no_libIDL=yes @@ -18047,7 +18053,7 @@ echo "configure:18024: checking for libIDL - version >= $min_libIDL_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -18133,7 +18139,7 @@ main () } EOF -if { (eval echo configure:18137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:18143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -18167,7 +18173,7 @@ fi CFLAGS="$CFLAGS $LIBIDL_CFLAGS" LIBS="$LIBS $LIBIDL_LIBS" cat > conftest.$ac_ext < @@ -18178,7 +18184,7 @@ int main() { return IDL_get_libver_string ? 1 : 0; ; return 0; } EOF -if { (eval echo configure:18182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding libIDL or finding the wrong" @@ -18306,7 +18312,7 @@ fi # Extract the first word of "glib-config", so it can be a program name with args. set dummy glib-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:18310: checking for $ac_word" >&5 +echo "configure:18316: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -18341,7 +18347,7 @@ fi min_glib_version=1.2.0 echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 -echo "configure:18345: checking for GLIB - version >= $min_glib_version" >&5 +echo "configure:18351: checking for GLIB - version >= $min_glib_version" >&5 no_glib="" if test "$GLIB_CONFIG" = "no" ; then no_glib=yes @@ -18364,7 +18370,7 @@ echo "configure:18345: checking for GLIB - version >= $min_glib_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -18440,7 +18446,7 @@ main () } EOF -if { (eval echo configure:18444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:18450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -18474,7 +18480,7 @@ fi CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" cat > conftest.$ac_ext < @@ -18484,7 +18490,7 @@ int main() { return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ; return 0; } EOF -if { (eval echo configure:18488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GLIB or finding the wrong" @@ -18528,7 +18534,7 @@ rm -f conftest* # Extract the first word of "libIDL-config", so it can be a program name with args. set dummy libIDL-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:18532: checking for $ac_word" >&5 +echo "configure:18538: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -18563,7 +18569,7 @@ fi min_libIDL_version=$LIBIDL_VERSION echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 -echo "configure:18567: checking for libIDL - version >= $min_libIDL_version" >&5 +echo "configure:18573: checking for libIDL - version >= $min_libIDL_version" >&5 no_libIDL="" if test "$LIBIDL_CONFIG" = "no" ; then no_libIDL=yes @@ -18590,7 +18596,7 @@ echo "configure:18567: checking for libIDL - version >= $min_libIDL_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -18676,7 +18682,7 @@ main () } EOF -if { (eval echo configure:18680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:18686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -18710,7 +18716,7 @@ fi CFLAGS="$CFLAGS $LIBIDL_CFLAGS" LIBS="$LIBS $LIBIDL_LIBS" cat > conftest.$ac_ext < @@ -18721,7 +18727,7 @@ int main() { return IDL_get_libver_string ? 1 : 0; ; return 0; } EOF -if { (eval echo configure:18725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding libIDL or finding the wrong" @@ -18761,7 +18767,7 @@ rm -f conftest* # 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:18765: checking for $ac_word" >&5 +echo "configure:18771: 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 @@ -18805,19 +18811,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 libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6 -echo "configure:18809: checking for libIDL-2.0 >= 0.8.0" >&5 +echo "configure:18815: checking for libIDL-2.0 >= 0.8.0" >&5 if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6 -echo "configure:18816: checking LIBIDL_CFLAGS" >&5 +echo "configure:18822: checking LIBIDL_CFLAGS" >&5 LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"` echo "$ac_t""$LIBIDL_CFLAGS" 1>&6 echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6 -echo "configure:18821: checking LIBIDL_LIBS" >&5 +echo "configure:18827: checking LIBIDL_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic LIBIDL_LIBS="`$PKG_CONFIG --libs \"libIDL-2.0 >= 0.8.0\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$LIBIDL_LIBS" 1>&6 @@ -18852,7 +18858,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:18856: checking for $ac_word" >&5 +echo "configure:18862: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ORBIT_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -18889,7 +18895,7 @@ done if test -n "$ORBIT_CONFIG"; then echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6 -echo "configure:18893: checking for ORBit libIDL usability" >&5 +echo "configure:18899: checking for ORBit libIDL usability" >&5 _ORBIT_CFLAGS=`${ORBIT_CONFIG} client --cflags` _ORBIT_LIBS=`${ORBIT_CONFIG} client --libs` _ORBIT_INC_PATH=`${PERL} -e '{ for $f (@ARGV) { print "$f " if ($f =~ m/^-I/); } }' -- ${_ORBIT_CFLAGS}` @@ -18906,7 +18912,7 @@ echo "configure:18893: checking for ORBit libIDL usability" >&5 result="maybe" else cat > conftest.$ac_ext < @@ -18921,7 +18927,7 @@ int main() { } EOF -if { (eval echo configure:18925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:18931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then _LIBIDL_FOUND=1 result="yes" @@ -18977,7 +18983,7 @@ if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then # 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:18981: checking for $ac_word" >&5 +echo "configure:18987: 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 @@ -19021,19 +19027,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 glib-2.0 >= 1.3.7 gobject-2.0""... $ac_c" 1>&6 -echo "configure:19025: checking for glib-2.0 >= 1.3.7 gobject-2.0" >&5 +echo "configure:19031: checking for glib-2.0 >= 1.3.7 gobject-2.0" >&5 if $PKG_CONFIG --exists "glib-2.0 >= 1.3.7 gobject-2.0" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking GLIB_CFLAGS""... $ac_c" 1>&6 -echo "configure:19032: checking GLIB_CFLAGS" >&5 +echo "configure:19038: checking GLIB_CFLAGS" >&5 GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 1.3.7 gobject-2.0"` echo "$ac_t""$GLIB_CFLAGS" 1>&6 echo $ac_n "checking GLIB_LIBS""... $ac_c" 1>&6 -echo "configure:19037: checking GLIB_LIBS" >&5 +echo "configure:19043: checking GLIB_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic GLIB_LIBS="`$PKG_CONFIG --libs \"glib-2.0 >= 1.3.7 gobject-2.0\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$GLIB_LIBS" 1>&6 @@ -19116,7 +19122,7 @@ fi # Extract the first word of "glib-config", so it can be a program name with args. set dummy glib-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:19120: checking for $ac_word" >&5 +echo "configure:19126: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -19151,7 +19157,7 @@ fi min_glib_version=${GLIB_VERSION} echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 -echo "configure:19155: checking for GLIB - version >= $min_glib_version" >&5 +echo "configure:19161: checking for GLIB - version >= $min_glib_version" >&5 no_glib="" if test "$GLIB_CONFIG" = "no" ; then no_glib=yes @@ -19174,7 +19180,7 @@ echo "configure:19155: checking for GLIB - version >= $min_glib_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -19250,7 +19256,7 @@ main () } EOF -if { (eval echo configure:19254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:19260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -19284,7 +19290,7 @@ fi CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" cat > conftest.$ac_ext < @@ -19294,7 +19300,7 @@ int main() { return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ; return 0; } EOF -if { (eval echo configure:19298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GLIB or finding the wrong" @@ -19374,19 +19380,19 @@ mk_add_options MOZ_CO_MODULE=mozilla/other-licenses/libart_lgpl" 1>&2; exit 1; } # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:19378: checking for working alloca.h" >&5 +echo "configure:19384: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:19390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -19407,12 +19413,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:19411: checking for alloca" >&5 +echo "configure:19417: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -19472,12 +19478,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:19476: checking whether alloca needs Cray hooks" >&5 +echo "configure:19482: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:19506: checking for $ac_func" >&5 +echo "configure:19512: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -19557,7 +19563,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:19561: checking stack direction for C alloca" >&5 +echo "configure:19567: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -19565,7 +19571,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:19594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -19633,17 +19639,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:19637: checking for $ac_hdr" >&5 +echo "configure:19643: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:19647: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:19653: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -19712,7 +19718,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:19716: checking for $ac_word" >&5 +echo "configure:19722: 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 @@ -19756,19 +19762,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:19760: checking for fontconfig freetype2" >&5 +echo "configure:19766: 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:19767: checking CAIRO_FT_CFLAGS" >&5 +echo "configure:19773: 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:19772: checking CAIRO_FT_LIBS" >&5 +echo "configure:19778: 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 @@ -19830,7 +19836,7 @@ echo "configure:19772: checking CAIRO_FT_LIBS" >&5 if test "$_WIN32_MSVC"; then MOZ_CAIRO_LIBS='$(LIBXUL_DIST)/lib/mozcairo.lib $(LIBXUL_DIST)/lib/mozlibpixman.lib' if test "$MOZ_ENABLE_GLITZ"; then - MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS $(LIBXUL_DIST)/lib/mozglitz.lib $(LIBXUL_DIST)/lib/mozglitzwgl.lib" + MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS "'$(LIBXUL_DIST)/lib/mozglitz.lib $(LIBXUL_DIST)/lib/mozglitzwgl.lib' fi else MOZ_CAIRO_LIBS='-L$(LIBXUL_DIST)/lib'" -lmozcairo -lmozlibpixman $CAIRO_FT_LIBS" @@ -19856,7 +19862,7 @@ echo "configure:19772: 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:19860: checking for $ac_word" >&5 +echo "configure:19866: 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 @@ -19900,19 +19906,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:19904: checking for cairo >= $CAIRO_VERSION freetype2 fontconfig" >&5 +echo "configure:19910: 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:19911: checking CAIRO_CFLAGS" >&5 +echo "configure:19917: 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:19916: checking CAIRO_LIBS" >&5 +echo "configure:19922: 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 @@ -19976,7 +19982,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:19980: checking for $ac_word" >&5 +echo "configure:19986: 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 @@ -20303,14 +20309,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 < int main() { int x = 1; x++; ; return 0; } EOF -if { (eval echo configure:20314: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -20618,7 +20624,7 @@ if test "$MOZ_X11"; then _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $XCFLAGS" cat > conftest.$ac_ext < @@ -20635,7 +20641,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:20639: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 diff --git a/mozilla/configure.in b/mozilla/configure.in index bca0ecf4b7f..be98afdd10e 100644 --- a/mozilla/configure.in +++ b/mozilla/configure.in @@ -6820,6 +6820,9 @@ if test -n "$MOZ_ENABLE_LIBXUL"; then XPCOM_LIBS="$LIBXUL_LIBS" AC_DEFINE(MOZ_ENABLE_LIBXUL) else + if test -n "$BUILD_STATIC_LIBS"; then + AC_DEFINE(MOZ_STATIC_BUILD) + fi XPCOM_LIBS="$DYNAMIC_XPCOM_LIBS" fi @@ -7127,7 +7130,7 @@ if test "$MOZ_SVG" -o "$MOZ_ENABLE_CANVAS" -o "$MOZ_ENABLE_CAIRO_GFX" ; then if test "$_WIN32_MSVC"; then MOZ_CAIRO_LIBS='$(LIBXUL_DIST)/lib/mozcairo.lib $(LIBXUL_DIST)/lib/mozlibpixman.lib' if test "$MOZ_ENABLE_GLITZ"; then - MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS $(LIBXUL_DIST)/lib/mozglitz.lib $(LIBXUL_DIST)/lib/mozglitzwgl.lib" + MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS "'$(LIBXUL_DIST)/lib/mozglitz.lib $(LIBXUL_DIST)/lib/mozglitzwgl.lib' fi else MOZ_CAIRO_LIBS='-L$(LIBXUL_DIST)/lib'" -lmozcairo -lmozlibpixman $CAIRO_FT_LIBS" diff --git a/mozilla/gfx/cairo/cairo/src/cairo-platform.h b/mozilla/gfx/cairo/cairo/src/cairo-platform.h index 16a00dd16f2..bade959e296 100644 --- a/mozilla/gfx/cairo/cairo/src/cairo-platform.h +++ b/mozilla/gfx/cairo/cairo/src/cairo-platform.h @@ -47,57 +47,37 @@ /* In libxul builds we don't ever want to export cairo symbols */ #define cairo_public extern CVISIBILITY_HIDDEN -#define CCALLBACK -#define CCALLBACK_DECL -#define CSTATIC_CALLBACK(__x) static __x -#elif defined(XP_WIN) - -#define cairo_public extern __declspec(dllexport) -#define CCALLBACK -#define CCALLBACK_DECL -#define CSTATIC_CALLBACK(__x) static __x - -#elif defined(XP_BEOS) - -#define cairo_public extern __declspec(dllexport) -#define CCALLBACK -#define CCALLBACK_DECL -#define CSTATIC_CALLBACK(__x) static __x - -#elif defined(XP_MAC) - -#define cairo_public extern __declspec(export) -#define CCALLBACK -#define CCALLBACK_DECL -#define CSTATIC_CALLBACK(__x) static __x - -#elif defined(XP_OS2) - -#ifdef __declspec -#define cairo_public extern __declspec(dllexport) #else -#define cairo_public extern -#endif -#define CCALLBACK -#define CCALLBACK_DECL -#define CSTATIC_CALLBACK(__x) static __x CCALLBACK -#else /* Unix */ - -#ifdef HAVE_VISIBILITY_ATTRIBUTE -#define CVISIBILITY_DEFAULT __attribute__((visibility("default"))) +#ifdef MOZ_STATIC_BUILD +# define cairo_public #else -#define CVISIBILITY_DEFAULT +# if defined(XP_WIN) || defined(XP_BEOS) +# define cairo_public extern __declspec(dllexport) +# elif defined(XP_MAC) +# define cairo_public extern __declspec(export) +# elif defined(XP_OS2) +# ifdef __declspec +# define cairo_public extern __declspec(dllexport) +# else +# define cairo_public extern +# endif +# else +# ifdef HAVE_VISIBILITY_ATTRIBUTE +# define cairo_public extern __attribute__((visibility("default"))) +# else +# define cairo_public extern +# endif +# endif +#endif + #endif -#define cairo_public extern CVISIBILITY_DEFAULT #define CCALLBACK #define CCALLBACK_DECL #define CSTATIC_CALLBACK(__x) static __x -#endif - #ifdef MOZILLA_VERSION #include "cairo-rename.h" #endif diff --git a/mozilla/gfx/src/thebes/Makefile.in b/mozilla/gfx/src/thebes/Makefile.in index 6f8fb61475a..463445ad9b7 100644 --- a/mozilla/gfx/src/thebes/Makefile.in +++ b/mozilla/gfx/src/thebes/Makefile.in @@ -106,6 +106,10 @@ REQUIRES += glitzwgl _OS_LIBS = usp10 OS_LIBS += $(call EXPAND_LIBNAME,$(_OS_LIBS)) + +ifdef MOZ_ENABLE_GLITZ +OS_LIBS += opengl32.lib +endif endif ifeq ($(MOZ_WIDGET_TOOLKIT),beos) diff --git a/mozilla/gfx/thebes/public/gfxTypes.h b/mozilla/gfx/thebes/public/gfxTypes.h index 8dcf26a7b3c..0dc0a322248 100644 --- a/mozilla/gfx/thebes/public/gfxTypes.h +++ b/mozilla/gfx/thebes/public/gfxTypes.h @@ -46,12 +46,12 @@ */ typedef double gfxFloat; -#if defined(MOZ_ENABLE_LIBXUL) -#define THEBES_API +#if defined(MOZ_ENABLE_LIBXUL) || defined(MOZ_STATIC_BUILD) +# define THEBES_API #elif defined(IMPL_THEBES) -#define THEBES_API NS_EXPORT +# define THEBES_API NS_EXPORT #else -#define THEBES_API NS_IMPORT +# define THEBES_API NS_IMPORT #endif /** diff --git a/mozilla/gfx/thebes/src/Makefile.in b/mozilla/gfx/thebes/src/Makefile.in index 56dff39aef1..1dbe1279d01 100644 --- a/mozilla/gfx/thebes/src/Makefile.in +++ b/mozilla/gfx/thebes/src/Makefile.in @@ -29,8 +29,6 @@ CPPSRCS = \ gfxPlatform.cpp \ $(NULL) -DEFINES += -DIMPL_THEBES - ifdef MOZ_TREE_CAIRO SHARED_LIBRARY_LIBS += \ $(DEPTH)/gfx/cairo/cairo/src/$(LIB_PREFIX)mozcairo.$(LIB_SUFFIX) \ @@ -97,6 +95,12 @@ CPPSRCS += gfxGlitzSurface.cpp SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)mozglitz.$(LIB_SUFFIX) +ifeq ($(MOZ_GFX_TOOLKIT),windows) +REQUIRES += glitzwgl +SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)mozglitzwgl.$(LIB_SUFFIX) +OS_LIBS += opengl32.lib +endif + ifeq ($(MOZ_GFX_TOOLKIT),gtk2) REQUIRES += glitzglx SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)mozglitzglx.$(LIB_SUFFIX) diff --git a/mozilla/layout/build/Makefile.in b/mozilla/layout/build/Makefile.in index b751f662807..af16fb1c749 100644 --- a/mozilla/layout/build/Makefile.in +++ b/mozilla/layout/build/Makefile.in @@ -209,18 +209,11 @@ ifdef NS_TRACE_MALLOC EXTRA_DSO_LIBS += tracemalloc endif -ifndef MOZ_ENABLE_CAIRO_GFX -ifdef MOZ_SVG -EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \ - $(NULL) -endif -endif - ifdef MOZ_ENABLE_CAIRO_GFX -ifndef MOZ_TREE_CAIRO -# In an in-tree cairo build, cairo is part of libthebes -# otherwise, we need to link it separately. -EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) +EXTRA_DSO_LIBS += thebes +else +ifdef MOZ_SVG +EXTRA_DSO_LIBS += mozcairo mozlibpixman endif endif