Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Generate local header for gfx specific defines

Browse Source 
Bug #202425 r=blizzard sr=roc+moz
This commit is contained in:
seawood%netscape.com 2003-04-22 16:26:14 +00:00
parent 4ef0bedeb7
commit 80d9441879
26 changed files with 242 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

255
configure vendored
View File

@ -3046,7 +3046,7 @@ else
echo "$ac_t""no" 1>&6
fi
for ac_prog in gawk mawk nawk awk
for ac_prog in mawk gawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@ -11272,7 +11272,13 @@ if test "x$ft_config_is_lt" != "xyes" ; then
fi
fi
if test "$MOZ_ENABLE_FREETYPE2"; then
cat >> confdefs.h <<\EOF
#define MOZ_ENABLE_FREETYPE2 1
EOF
_NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES MOZ_ENABLE_FREETYPE2"
fi
# Check whether --enable-xft or --disable-xft was given.
@ -11301,7 +11307,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:11305: checking for $ac_word" >&5
echo "configure:11311: 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
@ -11345,19 +11351,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 xft""... $ac_c" 1>&6
echo "configure:11349: checking for xft" >&5
echo "configure:11355: checking for xft" >&5
if $PKG_CONFIG --exists "xft" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_XFT_CFLAGS""... $ac_c" 1>&6
echo "configure:11356: checking MOZ_XFT_CFLAGS" >&5
echo "configure:11362: checking MOZ_XFT_CFLAGS" >&5
MOZ_XFT_CFLAGS=`$PKG_CONFIG --cflags "xft"`
echo "$ac_t""$MOZ_XFT_CFLAGS" 1>&6
echo $ac_n "checking MOZ_XFT_LIBS""... $ac_c" 1>&6
echo "configure:11361: checking MOZ_XFT_LIBS" >&5
echo "configure:11367: checking MOZ_XFT_LIBS" >&5
MOZ_XFT_LIBS=`$PKG_CONFIG --libs "xft"`
echo "$ac_t""$MOZ_XFT_LIBS" 1>&6
else
@ -11391,7 +11397,7 @@ echo "configure:11361: checking MOZ_XFT_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:11395: checking for $ac_word" >&5
echo "configure:11401: 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
@ -11435,19 +11441,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 pango >= 1.1.0""... $ac_c" 1>&6
echo "configure:11439: checking for pango >= 1.1.0" >&5
echo "configure:11445: checking for pango >= 1.1.0" >&5
if $PKG_CONFIG --exists "pango >= 1.1.0" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6
echo "configure:11446: checking _PANGOCHK_CFLAGS" >&5
echo "configure:11452: checking _PANGOCHK_CFLAGS" >&5
_PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.1.0"`
echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6
echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6
echo "configure:11451: checking _PANGOCHK_LIBS" >&5
echo "configure:11457: checking _PANGOCHK_LIBS" >&5
_PANGOCHK_LIBS=`$PKG_CONFIG --libs "pango >= 1.1.0"`
echo "$ac_t""$_PANGOCHK_LIBS" 1>&6
else
@ -11511,7 +11517,7 @@ then
_SAVE_LDFLAGS="$LDFLAGS"
LDFLAGS="$XLDFLAGS $LDFLAGS"
echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6
echo "configure:11515: checking for XpGetPrinterList in -lXp" >&5
echo "configure:11521: checking for XpGetPrinterList in -lXp" >&5
ac_lib_var=`echo Xp'_'XpGetPrinterList | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -11519,7 +11525,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lXp $XEXT_LIBS $XLIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 11523 "configure"
#line 11529 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@ -11530,7 +11536,7 @@ int main() {
XpGetPrinterList()
; return 0; }
EOF
if { (eval echo configure:11534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:11540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -12202,18 +12208,18 @@ fi
if test -n "$MOZ_OPTIMIZE"; then
echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6
echo "configure:12206: checking for valid optimization flags" >&5
echo "configure:12212: checking for valid optimization flags" >&5
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS"
cat > conftest.$ac_ext <<EOF
#line 12210 "configure"
#line 12216 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
printf("Hello World\n");
; return 0; }
EOF
if { (eval echo configure:12217: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:12223: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
_results=yes
else
@ -12431,7 +12437,7 @@ fi
if test -n "$_ENABLE_EFENCE"; then
echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6
echo "configure:12435: checking for malloc in -lefence" >&5
echo "configure:12441: checking for malloc in -lefence" >&5
ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -12439,7 +12445,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lefence $LIBS"
cat > conftest.$ac_ext <<EOF
#line 12443 "configure"
#line 12449 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@ -12450,7 +12456,7 @@ int main() {
malloc()
; return 0; }
EOF
if { (eval echo configure:12454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:12460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -12550,12 +12556,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
for ac_func in __builtin_vec_new __builtin_vec_delete __builtin_new __builtin_delete __pure_virtual
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:12554: checking for $ac_func" >&5
echo "configure:12560: 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 <<EOF
#line 12559 "configure"
#line 12565 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@ -12581,7 +12587,7 @@ $ac_func();
; return 0; }
EOF
if { (eval echo configure:12585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:12591: \"$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
@ -12802,7 +12808,7 @@ fi
if test -z "$SKIP_LIBRARY_CHECKS"; then
echo $ac_n "checking for cplus_demangle in -liberty""... $ac_c" 1>&6
echo "configure:12806: checking for cplus_demangle in -liberty" >&5
echo "configure:12812: checking for cplus_demangle in -liberty" >&5
ac_lib_var=`echo iberty'_'cplus_demangle | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -12810,7 +12816,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-liberty "-liberty" $LIBS"
cat > conftest.$ac_ext <<EOF
#line 12814 "configure"
#line 12820 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@ -12821,7 +12827,7 @@ int main() {
cplus_demangle()
; return 0; }
EOF
if { (eval echo configure:12825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:12831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -12974,7 +12980,7 @@ if test -z "$SKIP_COMPILER_CHECKS"; then
# Compiler Options
echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6
echo "configure:12978: checking for gcc -pipe support" >&5
echo "configure:12984: checking for gcc -pipe support" >&5
if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then
echo '#include <stdio.h>' > dummy-hello.c
echo 'int main() { printf("Hello World\n"); exit(0); }' >> dummy-hello.c
@ -12989,14 +12995,14 @@ if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -pipe"
cat > conftest.$ac_ext <<EOF
#line 12993 "configure"
#line 12999 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
printf("Hello World\n");
; return 0; }
EOF
if { (eval echo configure:13000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:13006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
_res_gcc_pipe="yes"
else
@ -13045,12 +13051,12 @@ if test "$_PEDANTIC"; then
_SAVE_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic"
echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6
echo "configure:13049: checking whether C++ compiler has -pedantic long long bug" >&5
echo "configure:13055: checking whether C++ compiler has -pedantic long long bug" >&5
if test "$cross_compiling" = yes; then
result="maybe"
else
cat > conftest.$ac_ext <<EOF
#line 13054 "configure"
#line 13060 "configure"
#include "confdefs.h"
#ifdef __cplusplus
extern "C" void exit(int);
@ -13059,7 +13065,7 @@ extern "C" void exit(int);
if (sizeof(long long) != 8) { return 1; }
return 0; }
EOF
if { (eval echo configure:13063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:13069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
result="no"
else
@ -13091,12 +13097,12 @@ fi
_SAVE_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}"
echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6
echo "configure:13095: checking for correct overload resolution with const and templates" >&5
echo "configure:13101: checking for correct overload resolution with const and templates" >&5
if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 13100 "configure"
#line 13106 "configure"
#include "confdefs.h"
template <class T>
@ -13126,7 +13132,7 @@ int main() {
; return 0; }
EOF
if { (eval echo configure:13130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:13136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_nscap_nonconst_opeq_bug="no"
else
@ -13166,16 +13172,16 @@ if test "$_IGNORE_LONG_LONG_WARNINGS"; then
_SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long"
echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6
echo "configure:13170: checking whether compiler supports -Wno-long-long" >&5
echo "configure:13176: checking whether compiler supports -Wno-long-long" >&5
cat > conftest.$ac_ext <<EOF
#line 13172 "configure"
#line 13178 "configure"
#include "confdefs.h"
int main() {
return(0);
; return 0; }
EOF
if { (eval echo configure:13179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:13185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
_WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
_WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
@ -13400,7 +13406,7 @@ case "$target" in
# Extract the first word of "makeC++SharedLib_r", so it can be a program name with args.
set dummy makeC++SharedLib_r; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:13404: checking for $ac_word" >&5
echo "configure:13410: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_AIX_SHLIB_BIN'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -13503,7 +13509,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:13507: checking for $ac_word" >&5
echo "configure:13513: 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
@ -13547,19 +13553,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:13551: checking for libIDL-2.0 >= 0.8.0" >&5
echo "configure:13557: 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:13558: checking LIBIDL_CFLAGS" >&5
echo "configure:13564: 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:13563: checking LIBIDL_LIBS" >&5
echo "configure:13569: checking LIBIDL_LIBS" >&5
LIBIDL_LIBS=`$PKG_CONFIG --libs "libIDL-2.0 >= 0.8.0"`
echo "$ac_t""$LIBIDL_LIBS" 1>&6
else
@ -13680,7 +13686,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:13684: checking for $ac_word" >&5
echo "configure:13690: 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
@ -13715,7 +13721,7 @@ fi
min_glib_version=1.2.0
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
echo "configure:13719: checking for GLIB - version >= $min_glib_version" >&5
echo "configure:13725: checking for GLIB - version >= $min_glib_version" >&5
no_glib=""
if test "$GLIB_CONFIG" = "no" ; then
no_glib=yes
@ -13738,7 +13744,7 @@ echo "configure:13719: checking for GLIB - version >= $min_glib_version" >&5
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
#line 13742 "configure"
#line 13748 "configure"
#include "confdefs.h"
#include <glib.h>
@ -13814,7 +13820,7 @@ main ()
}
EOF
if { (eval echo configure:13818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:13824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@ -13848,7 +13854,7 @@ fi
CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$LIBS $GLIB_LIBS"
cat > conftest.$ac_ext <<EOF
#line 13852 "configure"
#line 13858 "configure"
#include "confdefs.h"
#include <glib.h>
@ -13858,7 +13864,7 @@ int main() {
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
; return 0; }
EOF
if { (eval echo configure:13862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:13868: \"$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"
@ -13902,7 +13908,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:13906: checking for $ac_word" >&5
echo "configure:13912: 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
@ -13937,7 +13943,7 @@ fi
min_libIDL_version=$LIBIDL_VERSION
echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
echo "configure:13941: checking for libIDL - version >= $min_libIDL_version" >&5
echo "configure:13947: checking for libIDL - version >= $min_libIDL_version" >&5
no_libIDL=""
if test "$LIBIDL_CONFIG" = "no" ; then
no_libIDL=yes
@ -13964,7 +13970,7 @@ echo "configure:13941: checking for libIDL - version >= $min_libIDL_version" >&5
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
#line 13968 "configure"
#line 13974 "configure"
#include "confdefs.h"
#include <stdio.h>
@ -14050,7 +14056,7 @@ main ()
}
EOF
if { (eval echo configure:14054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:14060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@ -14084,7 +14090,7 @@ fi
CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
LIBS="$LIBS $LIBIDL_LIBS"
cat > conftest.$ac_ext <<EOF
#line 14088 "configure"
#line 14094 "configure"
#include "confdefs.h"
#include <stdio.h>
@ -14095,7 +14101,7 @@ int main() {
return IDL_get_libver_string ? 1 : 0;
; return 0; }
EOF
if { (eval echo configure:14099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:14105: \"$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"
@ -14135,7 +14141,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:14139: checking for $ac_word" >&5
echo "configure:14145: 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
@ -14257,7 +14263,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:14261: checking for $ac_word" >&5
echo "configure:14267: 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
@ -14292,7 +14298,7 @@ fi
min_glib_version=${GLIB_VERSION}
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
echo "configure:14296: checking for GLIB - version >= $min_glib_version" >&5
echo "configure:14302: checking for GLIB - version >= $min_glib_version" >&5
no_glib=""
if test "$GLIB_CONFIG" = "no" ; then
no_glib=yes
@ -14315,7 +14321,7 @@ echo "configure:14296: checking for GLIB - version >= $min_glib_version" >&5
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
#line 14319 "configure"
#line 14325 "configure"
#include "confdefs.h"
#include <glib.h>
@ -14391,7 +14397,7 @@ main ()
}
EOF
if { (eval echo configure:14395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:14401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@ -14425,7 +14431,7 @@ fi
CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$LIBS $GLIB_LIBS"
cat > conftest.$ac_ext <<EOF
#line 14429 "configure"
#line 14435 "configure"
#include "confdefs.h"
#include <glib.h>
@ -14435,7 +14441,7 @@ int main() {
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
; return 0; }
EOF
if { (eval echo configure:14439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:14445: \"$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"
@ -14578,14 +14584,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 14582 "configure"
#line 14588 "configure"
#include "confdefs.h"
#include <gmodule.h>
int main() {
int x = 1; x++;
; return 0; }
EOF
if { (eval echo configure:14589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:14595: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@ -14968,6 +14974,8 @@ EOF
# Save the defines header file before autoconf removes it.
# (Do not add AC_DEFINE calls after this line.)
_CONFIG_TMP=confdefs-tmp.h
@ -15082,19 +15090,7 @@ fi
trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
# Transform confdefs.h into DEFS.
# Protect against shell expansion while executing Makefile rules.
# Protect against Makefile macro expansion.
cat > conftest.defs <<\EOF
s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g
s%\[%\\&%g
s%\]%\\&%g
s%\$%$$%g
EOF
DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
rm -f conftest.defs
DEFS=-DHAVE_CONFIG_H
# Without the "./", some shells look in PATH for config.status.
: ${CONFIG_STATUS=./config.status}
@ -15132,7 +15128,7 @@ done
ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL"
trap 'rm -fr `echo "$MAKEFILES" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
trap 'rm -fr `echo "$MAKEFILES gfx/gfx-config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
@ -15565,6 +15561,113 @@ s%@INSTALL@%$INSTALL%g
fi; done
rm -f conftest.s*
# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
# NAME is the cpp macro being defined and VALUE is the value it is being given.
#
# ac_d sets the value in "#define NAME VALUE" lines.
ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)'
ac_dB='\([ ][ ]*\)[^ ]*%\1#\2'
ac_dC='\3'
ac_dD='%g'
# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
ac_uB='\([ ]\)%\1#\2define\3'
ac_uC=' '
ac_uD='\4%g'
# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
ac_eB='$%\1#\2define\3'
ac_eC=' '
ac_eD='%g'
if test "${CONFIG_HEADERS+set}" != set; then
EOF
cat >> $CONFIG_STATUS <<EOF
CONFIG_HEADERS="gfx/gfx-config.h"
EOF
cat >> $CONFIG_STATUS <<\EOF
fi
for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
# Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
case "$ac_file" in
*:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
*) ac_file_in="${ac_file}.in" ;;
esac
echo creating $ac_file
rm -f conftest.frag conftest.in conftest.out
ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
cat $ac_file_inputs > conftest.in
EOF
# Transform confdefs.h into a sed script conftest.vals that substitutes
# the proper values into config.h.in to produce config.h. And first:
# Protect against being on the right side of a sed subst in config.status.
# Protect against being in an unquoted here document in config.status.
rm -f conftest.vals
cat > conftest.hdr <<\EOF
s/[\\&%]/\\&/g
s%[\\$`]%\\&%g
s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
s%ac_d%ac_u%gp
s%ac_u%ac_e%gp
EOF
sed -n -f conftest.hdr confdefs.h > conftest.vals
rm -f conftest.hdr
# This sed command replaces #undef with comments. This is necessary, for
# example, in the case of _POSIX_SOURCE, which is predefined and required
# on some systems where configure will not decide to define it.
cat >> conftest.vals <<\EOF
s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
EOF
# Break up conftest.vals because some shells have a limit on
# the size of here documents, and old seds have small limits too.
rm -f conftest.tail
while :
do
ac_lines=`grep -c . conftest.vals`
# grep -c gives empty output for an empty file on some AIX systems.
if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
# Write a limited-size here document to conftest.frag.
echo ' cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
echo 'CEOF
sed -f conftest.frag conftest.in > conftest.out
rm -f conftest.in
mv conftest.out conftest.in
' >> $CONFIG_STATUS
sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
rm -f conftest.vals
mv conftest.tail conftest.vals
done
rm -f conftest.vals
cat >> $CONFIG_STATUS <<\EOF
rm -f conftest.frag conftest.h
echo "/* $ac_file. Generated automatically by configure. */" > conftest.h
cat conftest.in >> conftest.h
rm -f conftest.in
if cmp -s $ac_file conftest.h 2>/dev/null; then
echo "$ac_file is unchanged"
rm -f conftest.h
else
# Remove last slash and all that follows it. Not all systems have dirname.
ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
# The file is in a subdirectory.
test ! -d "$ac_dir" && mkdir "$ac_dir"
fi
rm -f $ac_file
mv conftest.h $ac_file
fi
fi; done
EOF
cat >> $CONFIG_STATUS <<EOF

7
configure.in
View File

@ -3319,7 +3319,10 @@ fi
if test -z "$_NO_FREETYPE2"; then
AC_CHECK_FT2(6.1.0, [MOZ_ENABLE_FREETYPE2=1], [MOZ_ENABLE_FREETYPE2=])
fi
if test "$MOZ_ENABLE_FREETYPE2"; then
AC_DEFINE(MOZ_ENABLE_FREETYPE2)
_NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES MOZ_ENABLE_FREETYPE2"
fi
AC_SUBST(MOZ_ENABLE_FREETYPE2)
dnl ========================================================
@ -5219,6 +5222,8 @@ AC_SUBST(ac_configure_args)
dnl Spit out some output
dnl ========================================================
AC_CONFIG_HEADER(gfx/gfx-config.h)
# Save the defines header file before autoconf removes it.
# (Do not add AC_DEFINE calls after this line.)
_CONFIG_TMP=confdefs-tmp.h

30
gfx/gfx-config.h.in Normal file
View File

@ -0,0 +1,30 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*
* The contents of this file are subject to the Mozilla Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is Netscape
* Communications Corporation. Portions created by Netscape are
* Copyright (C) 2003 Netscape Communications Corporation.
* All Rights Reserved.
*
* Contributor(s):
*
*/
#ifndef _GFX_CONFIG_H_
#define _GFX_CONFIG_H_
/* Define if freetype support is enabled */
#undef MOZ_ENABLE_FREETYPE2
#endif /* _GFX_CONFIG_H_ */

2
gfx/src/freetype/Makefile.in
View File

@ -48,7 +48,7 @@ EXTRA_DSO_LDOPTS = \
include $(topsrcdir)/config/rules.mk
ifdef MOZ_ENABLE_FREETYPE2
DEFINES += -DMOZ_ENABLE_FREETYPE2
LOCAL_INCLUDES = -I../..
INCLUDES += $(FT2_CFLAGS)
# due to runtime linking with PR_LoadLibrary
# EXTRA_DSO_LDOPTS does not need $(FT2_LIBS)

1
gfx/src/freetype/nsFreeType.h
View File

@ -24,6 +24,7 @@
#ifndef nsFreeType_h__
#define nsFreeType_h__
#include "gfx-config.h"
#if (defined(MOZ_ENABLE_FREETYPE2))
#include "nspr.h"

2
gfx/src/gtk/Makefile.in
View File

@ -185,6 +185,7 @@ EXTRA_DSO_LDOPTS += $(MOZ_XPRINT_LDFLAGS)
endif
LOCAL_INCLUDES = \
-I../.. \
-I$(srcdir)/. \
-I$(srcdir)/.. \
-I$(srcdir)/../shared \
@ -194,7 +195,6 @@ LOCAL_INCLUDES = \
$(NULL)
ifdef MOZ_ENABLE_FREETYPE2
DEFINES += -DMOZ_ENABLE_FREETYPE2
INCLUDES += $(FT2_CFLAGS)
endif

1
gfx/src/gtk/nsFontMetricsGTK.cpp
View File

@ -43,6 +43,7 @@
#define ENABLE_X_FONT_BANNING 1
#include <sys/types.h>
#include "gfx-config.h"
#include "nscore.h"
#include "nsQuickSort.h"
#include "nsFontMetricsGTK.h"

1
gfx/src/gtk/nsGfxFactoryGTK.cpp
View File

@ -38,6 +38,7 @@
*
* ***** END LICENSE BLOCK ***** */
#include "gfx-config.h"
#include "nsIGenericFactory.h"
#include "nsIModule.h"
#include "nsCOMPtr.h"

5
gfx/src/ps/Makefile.in
View File

@ -81,7 +81,6 @@ CPPSRCS += \
nsType1.cpp \
nsType8.cpp \
$(NULL)
DEFINES += -DMOZ_ENABLE_FREETYPE2
endif
include $(topsrcdir)/config/rules.mk
@ -93,7 +92,9 @@ endif
CFLAGS += $(TK_CFLAGS)
CXXFLAGS += $(TK_CFLAGS)
LOCAL_INCLUDES = -I$(srcdir)/.. \
LOCAL_INCLUDES = \
-I../.. \
-I$(srcdir)/.. \
$(NULL)
libs::

2
gfx/src/ps/nsDeviceContextPS.cpp
View File

@ -36,6 +36,8 @@
* the terms of any one of the NPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include "gfx-config.h"
/* PostScript/Xprint print modules do not support more than one object
* instance because they use global vars which cannot be shared between

1
gfx/src/ps/nsFontMetricsPS.cpp
View File

@ -37,6 +37,7 @@
*
* ***** END LICENSE BLOCK ***** */
#include "gfx-config.h"
#include "nsFontMetricsPS.h"
#include "nsDeviceContextPS.h"
#include "nsRenderingContextPS.h"

1
gfx/src/ps/nsFontMetricsPS.h
View File

@ -39,6 +39,7 @@
#ifndef nsFontMetricsPS_h__
#define nsFontMetricsPS_h__
#include "gfx-config.h"
#include "nsIFontMetrics.h"
#include "nsAFMObject.h"
#include "nsFont.h"

2
gfx/src/ps/nsPostScriptObj.cpp
View File

@ -28,6 +28,8 @@
* 04/20/2000 IBM Corp. OS/2 VisualAge build.
* 10/09/2000 IPLabs Linux Team True Unicode glyps support added.
*/
#include "gfx-config.h"
#define FORCE_PR_LOG /* Allow logging in the release build */
#define PR_LOGGING 1

1
gfx/src/x11shared/nsAntiAliasedGlyph.cpp
View File

@ -38,6 +38,7 @@
*
* ***** END LICENSE BLOCK ***** */
#include "gfx-config.h"
#include <stdlib.h>
#include <stdio.h>
#include <string.h>

1
gfx/src/x11shared/nsAntiAliasedGlyph.h
View File

@ -2,6 +2,7 @@
#ifndef NSANTIALIASEDGLYPH_H
#define NSANTIALIASEDGLYPH_H
#include "gfx-config.h"
#include "nscore.h"
#ifdef MOZ_ENABLE_FREETYPE2

1
gfx/src/x11shared/nsFT2FontCatalog.cpp
View File

@ -38,6 +38,7 @@
*
* ***** END LICENSE BLOCK ***** */
#include "gfx-config.h"
#include "nsFT2FontCatalog.h"
#include "nsFontDebug.h"

1
gfx/src/x11shared/nsFT2FontCatalog.h
View File

@ -41,6 +41,7 @@
#ifndef NS_FT2_FONT_CATALOG_H
#define NS_FT2_FONT_CATALOG_H
#include "gfx-config.h"
#include "nsIFontCatalogService.h"
#if (defined(MOZ_ENABLE_FREETYPE2))

1
gfx/src/x11shared/nsFT2FontNode.cpp
View File

@ -38,6 +38,7 @@
*
* ***** END LICENSE BLOCK ***** */
#include "gfx-config.h"
#include "nsFT2FontNode.h"
#include "nsFontDebug.h"

1
gfx/src/x11shared/nsFontFreeType.cpp
View File

@ -43,6 +43,7 @@
#define DEBUG_SHOW_GLYPH_BOX 0
#endif
#include "gfx-config.h"
#include "nsFontFreeType.h"
#include "nsUnicharUtils.h"

1
gfx/src/x11shared/nsFontFreeType.h
View File

@ -40,6 +40,7 @@
#ifndef nsFontFreeType_h__
#define nsFontFreeType_h__
#include "gfx-config.h"
#include "nsFontMetricsGTK.h"
#include "nsFreeType.h"

1
gfx/src/x11shared/nsX11AlphaBlend.cpp
View File

@ -37,6 +37,7 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include "gfx-config.h"
#include "nsCRT.h"
#include "nspr.h"
#include "nsAntiAliasedGlyph.h"

1
gfx/src/x11shared/nsXFontAAScaledBitmap.cpp
View File

@ -39,6 +39,7 @@
* ***** END LICENSE BLOCK ***** */
#include <X11/Xatom.h>
#include "gfx-config.h"
#include "nscore.h"
#include "nsXFontAAScaledBitmap.h"
#include "nsRenderingContextGTK.h"

1
gfx/src/x11shared/nsXFontNormal.cpp
View File

@ -38,6 +38,7 @@
*
* ***** END LICENSE BLOCK ***** */
#include "gfx-config.h"
#include "nscore.h"
#include "nsXFontNormal.h"
#include "nsRenderingContextGTK.h"

1
gfx/src/xlib/Makefile.in
View File

@ -120,6 +120,7 @@ EXTRA_DSO_LDOPTS += $(MOZ_XPRINT_LDFLAGS)
endif
LOCAL_INCLUDES += \
-I../.. \
-I$(srcdir)/. \
-I$(srcdir)/.. \
-I$(srcdir)/../shared \

1
gfx/src/xlib/nsFontMetricsXlib.cpp
View File

@ -46,6 +46,7 @@
#define ENABLE_X_FONT_BANNING 1
#include <sys/types.h>
#include "gfx-config.h"
#include "nscore.h"
#include "nsQuickSort.h"
#include "nsFontMetricsXlib.h"

1
gfx/src/xprint/Makefile.in
View File

@ -106,6 +106,7 @@ EXTRA_DSO_LDOPTS += \
$(NULL)
LOCAL_INCLUDES = \
-I../.. \
-I$(srcdir) \
-I$(srcdir)/../xlib \
-I$(srcdir)/../xlibrgb \