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

Split private xpcom defines into separate header. 

Bug #210409 r=dougt
This commit is contained in:
seawood%netscape.com 2003-07-03 20:55:23 +00:00
Родитель a44b082965
Коммит 1a6a612624
12 изменённых файлов: 108 добавлений и 84 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -11764,7 +11764,9 @@ if test "$MOZ_USE_NATIVE_UCONV"; then
EOF
fi
if test "$MOZ_USE_NATIVE_UCONV" -a "$ac_cv_func_iconv" != "yes"; then
{ echo "configure: error: iconv() not found. Cannot enable native uconv support." 1>&2; exit 1; }
fi
MOZ_PLAINTEXT_EDITOR_ONLY=
# Check whether --enable-plaintext-editor-only or --disable-plaintext-editor-only was given.
@ -12182,18 +12184,18 @@ fi
if test -n "$MOZ_OPTIMIZE"; then
echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6
echo "configure:12186: checking for valid optimization flags" >&5
echo "configure:12188: checking for valid optimization flags" >&5
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS"
cat > conftest.$ac_ext <<EOF
#line 12190 "configure"
#line 12192 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
printf("Hello World\n");
; return 0; }
EOF
if { (eval echo configure:12197: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:12199: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
_results=yes
else
@ -12411,7 +12413,7 @@ fi
if test -n "$_ENABLE_EFENCE"; then
echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6
echo "configure:12415: checking for malloc in -lefence" >&5
echo "configure:12417: 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
@ -12419,7 +12421,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lefence $LIBS"
cat > conftest.$ac_ext <<EOF
#line 12423 "configure"
#line 12425 "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
@ -12430,7 +12432,7 @@ int main() {
malloc()
; return 0; }
EOF
if { (eval echo configure:12434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:12436: \"$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
@ -12530,12 +12532,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:12534: checking for $ac_func" >&5
echo "configure:12536: 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 12539 "configure"
#line 12541 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@ -12561,7 +12563,7 @@ $ac_func();
; return 0; }
EOF
if { (eval echo configure:12565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:12567: \"$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
@ -12782,7 +12784,7 @@ fi
if test -z "$SKIP_LIBRARY_CHECKS"; then
echo $ac_n "checking for cplus_demangle in -liberty""... $ac_c" 1>&6
echo "configure:12786: checking for cplus_demangle in -liberty" >&5
echo "configure:12788: 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
@ -12790,7 +12792,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-liberty "-liberty" $LIBS"
cat > conftest.$ac_ext <<EOF
#line 12794 "configure"
#line 12796 "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
@ -12801,7 +12803,7 @@ int main() {
cplus_demangle()
; return 0; }
EOF
if { (eval echo configure:12805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:12807: \"$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
@ -12952,7 +12954,7 @@ if test -z "$SKIP_COMPILER_CHECKS"; then
# Compiler Options
echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6
echo "configure:12956: checking for gcc -pipe support" >&5
echo "configure:12958: 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
@ -12967,14 +12969,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 12971 "configure"
#line 12973 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
printf("Hello World\n");
; return 0; }
EOF
if { (eval echo configure:12978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:12980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
_res_gcc_pipe="yes"
else
@ -13023,12 +13025,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:13027: checking whether C++ compiler has -pedantic long long bug" >&5
echo "configure:13029: 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 13032 "configure"
#line 13034 "configure"
#include "confdefs.h"
#ifdef __cplusplus
extern "C" void exit(int);
@ -13037,7 +13039,7 @@ extern "C" void exit(int);
if (sizeof(long long) != 8) { return 1; }
return 0; }
EOF
if { (eval echo configure:13041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:13043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
result="no"
else
@ -13069,12 +13071,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:13073: checking for correct overload resolution with const and templates" >&5
echo "configure:13075: 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 13078 "configure"
#line 13080 "configure"
#include "confdefs.h"
template <class T>
@ -13104,7 +13106,7 @@ int main() {
; return 0; }
EOF
if { (eval echo configure:13108: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:13110: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_nscap_nonconst_opeq_bug="no"
else
@ -13144,16 +13146,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:13148: checking whether compiler supports -Wno-long-long" >&5
echo "configure:13150: checking whether compiler supports -Wno-long-long" >&5
cat > conftest.$ac_ext <<EOF
#line 13150 "configure"
#line 13152 "configure"
#include "confdefs.h"
int main() {
return(0);
; return 0; }
EOF
if { (eval echo configure:13157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:13159: \"$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"
@ -13382,7 +13384,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:13386: checking for $ac_word" >&5
echo "configure:13388: 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
@ -13507,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:13511: 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
@ -13551,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:13555: 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:13562: 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:13567: 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
@ -13684,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:13688: 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
@ -13719,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:13723: 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
@ -13742,7 +13744,7 @@ echo "configure:13723: checking for GLIB - version >= $min_glib_version" >&5
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
#line 13746 "configure"
#line 13748 "configure"
#include "confdefs.h"
#include <glib.h>
@ -13818,7 +13820,7 @@ main ()
}
EOF
if { (eval echo configure:13822: \"$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
@ -13852,7 +13854,7 @@ fi
CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$LIBS $GLIB_LIBS"
cat > conftest.$ac_ext <<EOF
#line 13856 "configure"
#line 13858 "configure"
#include "confdefs.h"
#include <glib.h>
@ -13862,7 +13864,7 @@ int main() {
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
; return 0; }
EOF
if { (eval echo configure:13866: \"$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"
@ -13906,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:13910: 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
@ -13941,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:13945: 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
@ -13968,7 +13970,7 @@ echo "configure:13945: checking for libIDL - version >= $min_libIDL_version" >&5
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
#line 13972 "configure"
#line 13974 "configure"
#include "confdefs.h"
#include <stdio.h>
@ -14054,7 +14056,7 @@ main ()
}
EOF
if { (eval echo configure:14058: \"$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
@ -14088,7 +14090,7 @@ fi
CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
LIBS="$LIBS $LIBIDL_LIBS"
cat > conftest.$ac_ext <<EOF
#line 14092 "configure"
#line 14094 "configure"
#include "confdefs.h"
#include <stdio.h>
@ -14099,7 +14101,7 @@ int main() {
return IDL_get_libver_string ? 1 : 0;
; return 0; }
EOF
if { (eval echo configure:14103: \"$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"
@ -14139,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:14143: 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
@ -14261,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:14265: 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
@ -14296,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:14300: 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
@ -14319,7 +14321,7 @@ echo "configure:14300: checking for GLIB - version >= $min_glib_version" >&5
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
#line 14323 "configure"
#line 14325 "configure"
#include "confdefs.h"
#include <glib.h>
@ -14395,7 +14397,7 @@ main ()
}
EOF
if { (eval echo configure:14399: \"$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
@ -14429,7 +14431,7 @@ fi
CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$LIBS $GLIB_LIBS"
cat > conftest.$ac_ext <<EOF
#line 14433 "configure"
#line 14435 "configure"
#include "confdefs.h"
#include <glib.h>
@ -14439,7 +14441,7 @@ int main() {
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
; return 0; }
EOF
if { (eval echo configure:14443: \"$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"
@ -14684,14 +14686,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 14688 "configure"
#line 14690 "configure"
#include "confdefs.h"
#include <gmodule.h>
int main() {
int x = 1; x++;
; return 0; }
EOF
if { (eval echo configure:14695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:14697: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@ -15263,7 +15265,11 @@ done
ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL"
trap 'rm -fr `echo "$MAKEFILES gfx/gfx-config.h netwerk/necko-config.h xpcom/xpcom-config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
trap 'rm -fr `echo "$MAKEFILES gfx/gfx-config.h
netwerk/necko-config.h
xpcom/xpcom-config.h
xpcom/xpcom-private.h
" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
@ -15722,7 +15728,11 @@ ac_eD='%g'
if test "${CONFIG_HEADERS+set}" != set; then
EOF
cat >> $CONFIG_STATUS <<EOF
CONFIG_HEADERS="gfx/gfx-config.h netwerk/necko-config.h xpcom/xpcom-config.h"
CONFIG_HEADERS="gfx/gfx-config.h
netwerk/necko-config.h
xpcom/xpcom-config.h
xpcom/xpcom-private.h
"
EOF
cat >> $CONFIG_STATUS <<\EOF
fi

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

@ -3496,7 +3496,9 @@ MOZ_ARG_ENABLE_BOOL(native-uconv,
if test "$MOZ_USE_NATIVE_UCONV"; then
AC_DEFINE(MOZ_USE_NATIVE_UCONV)
fi
if test "$MOZ_USE_NATIVE_UCONV" -a "$ac_cv_func_iconv" != "yes"; then
AC_MSG_ERROR([iconv() not found. Cannot enable native uconv support.])
fi
dnl ========================================================
dnl Libeditor can be build as plaintext-only,
@ -5309,7 +5311,12 @@ HAVE_SYS_VFS_H
HAVE_WCRTOMB
"
AC_CONFIG_HEADER(gfx/gfx-config.h netwerk/necko-config.h xpcom/xpcom-config.h)
AC_CONFIG_HEADER(
gfx/gfx-config.h
netwerk/necko-config.h
xpcom/xpcom-config.h
xpcom/xpcom-private.h
)
# Save the defines header file before autoconf removes it.
# (Do not add AC_DEFINE calls after this line.)

1
xpcom/build/Makefile.in
Просмотреть файл

@ -73,6 +73,7 @@ SHARED_LIBRARY_LIBS = \
$(NULL)
LOCAL_INCLUDES = \
-I.. \
-I$(srcdir)/../glue \
-I$(srcdir)/../base \
-I$(srcdir)/../ds \

2
xpcom/build/malloc.c
Просмотреть файл

@ -255,7 +255,7 @@
probably don't want to touch unless you are extending or adapting malloc.
*/
#include "xpcom-private.h"

1
xpcom/io/Makefile.in
Просмотреть файл

@ -156,3 +156,4 @@ include $(topsrcdir)/config/rules.mk
DEFINES += -D_IMPL_NS_COM
LOCAL_INCLUDES = -I..

2
xpcom/io/nsNativeCharsetUtils.cpp
Просмотреть файл

@ -39,6 +39,8 @@
*
* ***** END LICENSE BLOCK ***** */
#include "xpcom-private.h"
//-----------------------------------------------------------------------------
// XP_UNIX
//-----------------------------------------------------------------------------

1
xpcom/obsolete/Makefile.in
Просмотреть файл

@ -68,6 +68,7 @@ EXPORTS = \
$(NULL)
LOCAL_INCLUDES = \
-I.. \
-I$(srcdir)/../io \
$(NULL)

1
xpcom/obsolete/nsFileSpecUnix.cpp
Просмотреть файл

@ -45,6 +45,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <limits.h>
#include "xpcom-private.h"
#include "nsError.h"
#include "prio.h" /* for PR_Rename */

27
xpcom/private-config.h.in Normal file
Просмотреть файл

@ -0,0 +1,27 @@
/* Global defines needed by xpcom implementation */
#ifndef _PRIVATE_CONFIG_H_
#define _PRIVATE_CONFIG_H_
#undef HAVE_64BIT_OS
#undef HAVE_DLFCN_H
#undef HAVE_GCC3_ABI
#undef HAVE_ICONV
#undef HAVE_ICONV_WITH_CONST_INPUT
#undef HAVE_MBRTOWC
#undef HAVE_MMAP
#undef MOZ_DLL_SUFFIX
#undef MOZILLA_VERSION
#undef HAVE_WCRTOMB
#endif /* _PRIVATE_CONFIG_H_ */

28
xpcom/xpcom-config.h.in
Просмотреть файл

@ -62,32 +62,4 @@
/* Define to either <new> or <new.h> */
#undef NEW_H
/* The following defines are only used by the xpcom implementation */
#ifdef _IMPL_NS_COM
/* Define if getpagesize() is available */
#undef HAVE_GETPAGESIZE
/* Define if iconv() is available */
#undef HAVE_ICONV
/* Define if iconv() supports const input */
#undef HAVE_ICONV_WITH_CONST_INPUT
/* Define if mbrtowc() is available */
#undef HAVE_MBRTOWC
/* Define if <sys/mount.h> is present */
#undef HAVE_SYS_MOUNT_H
/* Define if <sys/vfs.h> is present */
#undef HAVE_SYS_VFS_H
/* Define if wcrtomb() is available */
#undef HAVE_WCRTOMB
#endif /* _IMPL_NS_COM */
#endif /* _XPCOM_CONFIG_H_ */

1
xpcom_obsolete/Makefile.in
Просмотреть файл

@ -68,6 +68,7 @@ EXPORTS = \
$(NULL)
LOCAL_INCLUDES = \
-I.. \
-I$(srcdir)/../io \
$(NULL)

1
xpcom_obsolete/nsFileSpecUnix.cpp
Просмотреть файл

@ -45,6 +45,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <limits.h>
#include "xpcom-private.h"
#include "nsError.h"
#include "prio.h" /* for PR_Rename */