mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-13 03:24:26 +00:00
Bug 671465 - Remove whitespace from configure. rs=khuey
This commit is contained in:
Matheus Kerschbaum
parent
fc5b42b95c
commit
350372a09a
194
configure.in
194
configure.in
@ -70,7 +70,7 @@ TARGET_CPU="${target_cpu}"
|
||||
TARGET_VENDOR="${target_vendor}"
|
||||
TARGET_OS="${target_os}"
|
||||
|
||||
MOZ_DEB_TIMESTAMP=`date +"%a, %d %b %Y %T %z" 2>&1`
|
||||
MOZ_DEB_TIMESTAMP=`date +"%a, %d %b %Y %T %z" 2>&1`
|
||||
AC_SUBST(MOZ_DEB_TIMESTAMP)
|
||||
|
||||
dnl ========================================================
|
||||
@ -471,7 +471,7 @@ if test -n "$CROSS_COMPILE" -a "$target" != "$host"; then
|
||||
LDFLAGS="$HOST_LDFLAGS"
|
||||
|
||||
AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
|
||||
AC_TRY_COMPILE([], [return(0);],
|
||||
AC_TRY_COMPILE([], [return(0);],
|
||||
[ac_cv_prog_hostcc_works=1 AC_MSG_RESULT([yes])],
|
||||
AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
|
||||
|
||||
@ -479,10 +479,10 @@ if test -n "$CROSS_COMPILE" -a "$target" != "$host"; then
|
||||
CFLAGS="$HOST_CXXFLAGS"
|
||||
|
||||
AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
|
||||
AC_TRY_COMPILE([], [return(0);],
|
||||
AC_TRY_COMPILE([], [return(0);],
|
||||
[ac_cv_prog_hostcxx_works=1 AC_MSG_RESULT([yes])],
|
||||
AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
|
||||
|
||||
|
||||
CC=$_SAVE_CC
|
||||
CFLAGS=$_SAVE_CFLAGS
|
||||
LDFLAGS=$_SAVE_LDFLAGS
|
||||
@ -668,11 +668,11 @@ case "$target" in
|
||||
[ unsigned *test = new unsigned(42); ],,
|
||||
AC_MSG_ERROR([\$(CXX) test failed. You must have MS VC++ in your path to build.]) )
|
||||
AC_LANG_RESTORE
|
||||
|
||||
|
||||
changequote(,)
|
||||
_MSVC_VER_FILTER='s|.* ([0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)?).*|\1|p'
|
||||
changequote([,])
|
||||
|
||||
|
||||
# Determine compiler version
|
||||
CC_VERSION=`"${CC}" -v 2>&1 | sed -nre "$_MSVC_VER_FILTER"`
|
||||
_CC_MAJOR_VERSION=`echo ${CC_VERSION} | $AWK -F\. '{ print $1 }'`
|
||||
@ -1015,7 +1015,7 @@ if test "$_perl_res" != 0; then
|
||||
AC_MSG_RESULT([no])
|
||||
AC_MSG_ERROR([Cannot find Config.pm or \$Config{archlib}. A full perl installation is required.])
|
||||
else
|
||||
AC_MSG_RESULT([yes])
|
||||
AC_MSG_RESULT([yes])
|
||||
fi
|
||||
|
||||
MOZ_PATH_PROGS(PYTHON, $PYTHON python2.7 python2.6 python2.5 python)
|
||||
@ -1488,7 +1488,7 @@ Darwin)
|
||||
OS_TEST=ppc
|
||||
;;
|
||||
i*86*)
|
||||
OS_TEST=i386
|
||||
OS_TEST=i386
|
||||
;;
|
||||
x86_64)
|
||||
OS_TEST=x86_64
|
||||
@ -2011,7 +2011,7 @@ case "$target" in
|
||||
if test ! "$GNU_CC"; then
|
||||
if test ! "$HAVE_64BIT_OS"; then
|
||||
# Compiling with Visual Age C++ object model compat is the
|
||||
# default. To compile with object model ibm, add
|
||||
# default. To compile with object model ibm, add
|
||||
# AIX_OBJMODEL=ibm to .mozconfig.
|
||||
if test "$AIX_OBJMODEL" = "ibm"; then
|
||||
CXXFLAGS="$CXXFLAGS -qobjmodel=ibm"
|
||||
@ -2039,10 +2039,10 @@ case "$target" in
|
||||
#endif],
|
||||
_BAD_COMPILER=,_BAD_COMPILER=1)
|
||||
if test -n "$_BAD_COMPILER"; then
|
||||
AC_MSG_RESULT([no])
|
||||
AC_MSG_RESULT([no])
|
||||
AC_MSG_ERROR([IBM XLC/C++ 9.0.0.7 or higher is required to build.])
|
||||
else
|
||||
AC_MSG_RESULT([yes])
|
||||
AC_MSG_RESULT([yes])
|
||||
fi
|
||||
AC_LANG_RESTORE
|
||||
TARGET_COMPILER_ABI="ibmc"
|
||||
@ -2080,7 +2080,7 @@ case "$target" in
|
||||
esac
|
||||
;;
|
||||
|
||||
*-darwin*)
|
||||
*-darwin*)
|
||||
MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
|
||||
MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
|
||||
# If we're building with --enable-profiling, we need a frame pointer.
|
||||
@ -2132,7 +2132,7 @@ case "$target" in
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
|
||||
|
||||
LDFLAGS=$_SAVE_LDFLAGS
|
||||
fi
|
||||
MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
|
||||
@ -2146,7 +2146,7 @@ case "$target" in
|
||||
if test ! "$GNU_CC"; then
|
||||
DSO_LDOPTS="-Bshareable $DSO_LDOPTS"
|
||||
fi
|
||||
;;
|
||||
;;
|
||||
|
||||
ia64*-hpux*)
|
||||
DLL_SUFFIX=".so"
|
||||
@ -2247,8 +2247,8 @@ ia64*-hpux*)
|
||||
;;
|
||||
esac
|
||||
|
||||
if test -z "$MC"; then
|
||||
MC=mc.exe
|
||||
if test -z "$MC"; then
|
||||
MC=mc.exe
|
||||
fi
|
||||
;;
|
||||
*-mingw*)
|
||||
@ -2257,7 +2257,7 @@ ia64*-hpux*)
|
||||
DLL_SUFFIX=.dll
|
||||
RC=rc.exe
|
||||
MC=mc.exe
|
||||
# certain versions of cygwin's makedepend barf on the
|
||||
# certain versions of cygwin's makedepend barf on the
|
||||
# #include <string> vs -I./dist/include/string issue so don't use it
|
||||
SYSTEM_MAKEDEPEND=
|
||||
if test -n "$GNU_CC"; then
|
||||
@ -2397,7 +2397,7 @@ ia64*-hpux*)
|
||||
AC_MSG_ERROR([\$MOZ_TOOLS\\bin must be in your path.])
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
esac
|
||||
|
||||
case "$host_os" in
|
||||
cygwin*|msvc*|mks*)
|
||||
@ -2575,7 +2575,7 @@ alpha*-*-osf*)
|
||||
AC_DEFINE(NEED_USLEEP_PROTOTYPE)
|
||||
;;
|
||||
|
||||
*-sco*)
|
||||
*-sco*)
|
||||
AC_DEFINE(NSCAP_DISABLE_TEST_DONTQUERY_CASES)
|
||||
AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
|
||||
CXXFLAGS="$CXXFLAGS -I/usr/include/CC"
|
||||
@ -2584,7 +2584,7 @@ alpha*-*-osf*)
|
||||
fi
|
||||
;;
|
||||
|
||||
*-solaris*)
|
||||
*-solaris*)
|
||||
AC_DEFINE(SOLARIS)
|
||||
TARGET_NSPR_MDCPUCFG='\"md/_solaris.cfg\"'
|
||||
SYSTEM_MAKEDEPEND=
|
||||
@ -2603,7 +2603,7 @@ alpha*-*-osf*)
|
||||
LDFLAGS="-xildoff $LDFLAGS"
|
||||
if test -z "$CROSS_COMPILE" -a -f /usr/lib/ld/map.noexstk; then
|
||||
_SAVE_LDFLAGS=$LDFLAGS
|
||||
LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS"
|
||||
LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS"
|
||||
AC_TRY_LINK([#include <stdio.h>],
|
||||
[printf("Hello World\n");],
|
||||
,
|
||||
@ -2670,7 +2670,7 @@ alpha*-*-osf*)
|
||||
fi
|
||||
;;
|
||||
|
||||
*-sunos*)
|
||||
*-sunos*)
|
||||
DSO_LDOPTS='-Bdynamic'
|
||||
MKSHLIB='-$(LD) $(DSO_LDOPTS) -o $@'
|
||||
MKCSHLIB='-$(LD) $(DSO_LDOPTS) -o $@'
|
||||
@ -2683,7 +2683,7 @@ alpha*-*-osf*)
|
||||
esac
|
||||
;;
|
||||
|
||||
*-sysv4.2uw7*)
|
||||
*-sysv4.2uw7*)
|
||||
NSPR_LIBS="-lnspr$NSPR_VERSION -lplc$NSPR_VERSION -lplds$NSPR_VERSION -L/usr/ccs/lib -lcrt"
|
||||
;;
|
||||
|
||||
@ -2745,7 +2745,7 @@ case "$target" in
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
*-nto*)
|
||||
*-nto*)
|
||||
MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script'
|
||||
;;
|
||||
*-darwin*)
|
||||
@ -2918,7 +2918,7 @@ AC_LANG_CPLUSPLUS
|
||||
AC_MSG_CHECKING(for uname.domainname)
|
||||
AC_CACHE_VAL(ac_cv_have_uname_domainname_field,
|
||||
[AC_TRY_COMPILE([#include <sys/utsname.h>],
|
||||
[ struct utsname *res; char *domain;
|
||||
[ struct utsname *res; char *domain;
|
||||
(void)uname(res); if (res != 0) { domain = res->domainname; } ],
|
||||
[ac_cv_have_uname_domainname_field=true],
|
||||
[ac_cv_have_uname_domainname_field=false])])
|
||||
@ -2933,7 +2933,7 @@ fi
|
||||
AC_MSG_CHECKING(for uname.__domainname)
|
||||
AC_CACHE_VAL(ac_cv_have_uname_us_domainname_field,
|
||||
[AC_TRY_COMPILE([#include <sys/utsname.h>],
|
||||
[ struct utsname *res; char *domain;
|
||||
[ struct utsname *res; char *domain;
|
||||
(void)uname(res); if (res != 0) { domain = res->__domainname; } ],
|
||||
[ac_cv_have_uname_us_domainname_field=true],
|
||||
[ac_cv_have_uname_us_domainname_field=false])])
|
||||
@ -3028,7 +3028,7 @@ dnl Note that we assume that mac & win32 have short wchar (see nscore.h)
|
||||
_SAVE_CXXFLAGS=$CXXFLAGS
|
||||
CXXFLAGS="$CXXFLAGS -fshort-wchar"
|
||||
|
||||
AC_CACHE_CHECK(for compiler -fshort-wchar option,
|
||||
AC_CACHE_CHECK(for compiler -fshort-wchar option,
|
||||
ac_cv_have_usable_wchar_option_v2,
|
||||
[AC_TRY_LINK([#include <stddef.h>
|
||||
$configure_static_assert_macros],
|
||||
@ -3048,7 +3048,7 @@ dnl Note that we assume that mac & win32 have short wchar (see nscore.h)
|
||||
else
|
||||
WCHAR_CFLAGS="-fshort-wchar"
|
||||
fi
|
||||
else
|
||||
else
|
||||
CXXFLAGS=$_SAVE_CXXFLAGS
|
||||
fi
|
||||
fi
|
||||
@ -3276,8 +3276,8 @@ case $target in
|
||||
*-os2*)
|
||||
;;
|
||||
*)
|
||||
AC_SEARCH_LIBS(dlopen, dl,
|
||||
MOZ_CHECK_HEADER(dlfcn.h,
|
||||
AC_SEARCH_LIBS(dlopen, dl,
|
||||
MOZ_CHECK_HEADER(dlfcn.h,
|
||||
AC_DEFINE(HAVE_DLOPEN)))
|
||||
;;
|
||||
esac
|
||||
@ -3326,11 +3326,11 @@ else
|
||||
[MISSING_X="$MISSING_X -lX11"], $XLIBS)
|
||||
AC_CHECK_LIB(Xext, XextAddDisplay, [XEXT_LIBS="-lXext"],
|
||||
[MISSING_X="$MISSING_X -lXext"], $XLIBS)
|
||||
|
||||
|
||||
AC_CHECK_LIB(Xt, XtFree, [ XT_LIBS="-lXt"], [
|
||||
unset ac_cv_lib_Xt_XtFree
|
||||
AC_CHECK_LIB(ICE, IceFlush, [XT_LIBS="-lICE $XT_LIBS"],, $XT_LIBS $XLIBS)
|
||||
AC_CHECK_LIB(SM, SmcCloseConnection, [XT_LIBS="-lSM $XT_LIBS"],, $XT_LIBS $XLIBS)
|
||||
AC_CHECK_LIB(SM, SmcCloseConnection, [XT_LIBS="-lSM $XT_LIBS"],, $XT_LIBS $XLIBS)
|
||||
AC_CHECK_LIB(Xt, XtFree, [ XT_LIBS="-lXt $XT_LIBS"],
|
||||
[MISSING_X="$MISSING_X -lXt"], $X_PRE_LIBS $XT_LIBS $XLIBS)
|
||||
])
|
||||
@ -3428,7 +3428,7 @@ darwin*)
|
||||
esac
|
||||
|
||||
dnl ========================================================
|
||||
dnl Check the command line for --with-pthreads
|
||||
dnl Check the command line for --with-pthreads
|
||||
dnl ========================================================
|
||||
MOZ_ARG_WITH_BOOL(pthreads,
|
||||
[ --with-pthreads Force use of system pthread library with NSPR ],
|
||||
@ -3510,30 +3510,30 @@ then
|
||||
;;
|
||||
|
||||
*-*-linux*|*-*-kfreebsd*-gnu|*-*-gnu*)
|
||||
AC_DEFINE(_REENTRANT)
|
||||
AC_DEFINE(_REENTRANT)
|
||||
;;
|
||||
|
||||
*-*-nto*)
|
||||
AC_DEFINE(_REENTRANT)
|
||||
*-*-nto*)
|
||||
AC_DEFINE(_REENTRANT)
|
||||
;;
|
||||
|
||||
*-aix4.3*|*-aix5*)
|
||||
AC_DEFINE(_REENTRANT)
|
||||
AC_DEFINE(_REENTRANT)
|
||||
;;
|
||||
|
||||
*-hpux11.*)
|
||||
AC_DEFINE(_REENTRANT)
|
||||
AC_DEFINE(_REENTRANT)
|
||||
;;
|
||||
|
||||
alpha*-*-osf*)
|
||||
AC_DEFINE(_REENTRANT)
|
||||
;;
|
||||
|
||||
*-*-solaris*)
|
||||
*-*-solaris*)
|
||||
AC_DEFINE(_REENTRANT)
|
||||
if test "$SOLARIS_SUNPRO_CC"; then
|
||||
CFLAGS="$CFLAGS -mt"
|
||||
CXXFLAGS="$CXXFLAGS -mt"
|
||||
CFLAGS="$CFLAGS -mt"
|
||||
CXXFLAGS="$CXXFLAGS -mt"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
@ -3627,7 +3627,7 @@ AC_CACHE_CHECK(
|
||||
],
|
||||
[const char *glibc_version = gnu_get_libc_version();],
|
||||
[ac_cv_func_gnu_get_libc_version=yes],
|
||||
[ac_cv_func_gnu_get_libc_version=no]
|
||||
[ac_cv_func_gnu_get_libc_version=no]
|
||||
)]
|
||||
)
|
||||
|
||||
@ -3639,7 +3639,7 @@ case $target_os in
|
||||
darwin*|mingw*|os2*)
|
||||
;;
|
||||
*)
|
||||
|
||||
|
||||
AC_CHECK_LIB(c, iconv, [_ICONV_LIBS="$_ICONV_LIBS"],
|
||||
AC_CHECK_LIB(iconv, iconv, [_ICONV_LIBS="$_ICONV_LIBS -liconv"],
|
||||
AC_CHECK_LIB(iconv, libiconv, [_ICONV_LIBS="$_ICONV_LIBS -liconv"])))
|
||||
@ -3658,7 +3658,7 @@ AC_CACHE_CHECK(
|
||||
iconv_close(h);
|
||||
],
|
||||
[ac_cv_func_iconv=yes],
|
||||
[ac_cv_func_iconv=no]
|
||||
[ac_cv_func_iconv=no]
|
||||
)]
|
||||
)
|
||||
if test "$ac_cv_func_iconv" = "yes"; then
|
||||
@ -3680,7 +3680,7 @@ if test "$ac_cv_func_iconv" = "yes"; then
|
||||
iconv_close(h);
|
||||
],
|
||||
[ac_cv_func_const_iconv=yes],
|
||||
[ac_cv_func_const_iconv=no]
|
||||
[ac_cv_func_const_iconv=no]
|
||||
)]
|
||||
)
|
||||
if test "$ac_cv_func_const_iconv" = "yes"; then
|
||||
@ -3853,7 +3853,7 @@ fi
|
||||
dnl Check to see if we can resolve ambiguity with |using|.
|
||||
AC_CACHE_CHECK(whether the C++ \"using\" keyword resolves ambiguity,
|
||||
ac_cv_cpp_ambiguity_resolving_using,
|
||||
[AC_TRY_COMPILE(class X {
|
||||
[AC_TRY_COMPILE(class X {
|
||||
public: int go(const X&) {return 3;}
|
||||
int jo(const X&) {return 3;}
|
||||
};
|
||||
@ -4002,7 +4002,7 @@ AC_CACHE_CHECK(for __attribute__((noreturn)),
|
||||
[],
|
||||
ac_cv_attribute_noreturn=yes,
|
||||
ac_cv_attribute_noreturn=no)])
|
||||
|
||||
|
||||
dnl End of C++ language/feature checks
|
||||
AC_LANG_C
|
||||
|
||||
@ -4111,7 +4111,7 @@ MOZ_ARG_WITH_BOOL(system-libxul,
|
||||
SYSTEM_LIBXUL=1)
|
||||
|
||||
dnl ========================================================
|
||||
dnl = If NSPR was not detected in the system,
|
||||
dnl = If NSPR was not detected in the system,
|
||||
dnl = use the one in the source tree (mozilla/nsprpub)
|
||||
dnl ========================================================
|
||||
MOZ_ARG_WITH_BOOL(system-nspr,
|
||||
@ -4184,7 +4184,7 @@ AC_SUBST(MOZ_LIBEVENT_INCLUDES)
|
||||
AC_SUBST(MOZ_LIBEVENT_LIBS)
|
||||
|
||||
dnl ========================================================
|
||||
dnl = If NSS was not detected in the system,
|
||||
dnl = If NSS was not detected in the system,
|
||||
dnl = use the one in the source tree (mozilla/security/nss)
|
||||
dnl ========================================================
|
||||
|
||||
@ -4269,7 +4269,7 @@ if test "$SYSTEM_JPEG" = 1; then
|
||||
#error "Insufficient JPEG library version ($MOZJPEG required)."
|
||||
#endif ],
|
||||
SYSTEM_JPEG=1,
|
||||
[SYSTEM_JPEG= JPEG_CFLAGS= JPEG_LIBS=])
|
||||
[SYSTEM_JPEG= JPEG_CFLAGS= JPEG_LIBS=])
|
||||
fi
|
||||
CFLAGS=$_SAVE_CFLAGS
|
||||
LDFLAGS=$_SAVE_LDFLAGS
|
||||
@ -4297,7 +4297,7 @@ fi
|
||||
if test -z "$ZLIB_DIR" -o "$ZLIB_DIR" = no; then
|
||||
SYSTEM_ZLIB=
|
||||
else
|
||||
AC_CHECK_LIB(z, gzread, [SYSTEM_ZLIB=1 ZLIB_LIBS="-lz $ZLIB_LIBS"],
|
||||
AC_CHECK_LIB(z, gzread, [SYSTEM_ZLIB=1 ZLIB_LIBS="-lz $ZLIB_LIBS"],
|
||||
[SYSTEM_ZLIB= ZLIB_CFLAGS= ZLIB_LIBS=], $ZLIB_LIBS)
|
||||
fi
|
||||
if test "$SYSTEM_ZLIB" = 1; then
|
||||
@ -4305,11 +4305,11 @@ if test "$SYSTEM_ZLIB" = 1; then
|
||||
AC_TRY_COMPILE([ #include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <zlib.h> ],
|
||||
[ #if ZLIB_VERNUM < $MOZZLIB
|
||||
[ #if ZLIB_VERNUM < $MOZZLIB
|
||||
#error "Insufficient zlib version ($MOZZLIB required)."
|
||||
#endif ],
|
||||
SYSTEM_ZLIB=1,
|
||||
[SYSTEM_ZLIB= ZLIB_CFLAGS= ZLIB_LIBS=])
|
||||
[SYSTEM_ZLIB= ZLIB_CFLAGS= ZLIB_LIBS=])
|
||||
fi
|
||||
CFLAGS=$_SAVE_CFLAGS
|
||||
LDFLAGS=$_SAVE_LDFLAGS
|
||||
@ -4351,7 +4351,7 @@ fi
|
||||
|
||||
dnl system PNG Support
|
||||
dnl ========================================================
|
||||
MOZ_ARG_WITH_STRING(system-png,
|
||||
MOZ_ARG_WITH_STRING(system-png,
|
||||
[ --with-system-png[=PFX]
|
||||
Use system libpng [installed at prefix PFX]],
|
||||
PNG_DIR=$withval)
|
||||
@ -4370,7 +4370,7 @@ if test -z "$PNG_DIR" -o "$PNG_DIR" = no; then
|
||||
else
|
||||
_SAVE_PNG_LIBS=$PNG_LIBS
|
||||
AC_CHECK_LIB(png, png_get_valid, [SYSTEM_PNG=1 PNG_LIBS="-lpng $PNG_LIBS"],
|
||||
AC_MSG_ERROR([--with-system-png requested but no working libpng found]),
|
||||
AC_MSG_ERROR([--with-system-png requested but no working libpng found]),
|
||||
$PNG_LIBS)
|
||||
AC_CHECK_LIB(png, png_get_acTL, ,
|
||||
AC_MSG_ERROR([--with-system-png won't work because the system's libpng doesn't have APNG support]),
|
||||
@ -4520,7 +4520,7 @@ esac
|
||||
case "$target_os" in
|
||||
mingw*)
|
||||
NS_ENABLE_TSF=1
|
||||
if test -z "$GNU_CC"; then
|
||||
if test -z "$GNU_CC"; then
|
||||
if test "$MOZ_WINSDK_TARGETVER" -lt "06000000"; then
|
||||
NS_ENABLE_TSF=
|
||||
fi
|
||||
@ -4637,9 +4637,9 @@ AC_SUBST(MOZ_XULRUNNER)
|
||||
AC_DEFINE_UNQUOTED(MOZ_BUILD_APP,$MOZ_BUILD_APP)
|
||||
|
||||
dnl ========================================================
|
||||
dnl =
|
||||
dnl =
|
||||
dnl = Toolkit Options
|
||||
dnl =
|
||||
dnl =
|
||||
dnl ========================================================
|
||||
MOZ_ARG_HEADER(Toolkit Options)
|
||||
|
||||
@ -4967,7 +4967,7 @@ AC_SUBST(MOZ_X11)
|
||||
dnl ========================================================
|
||||
dnl =
|
||||
dnl = Components & Features
|
||||
dnl =
|
||||
dnl =
|
||||
dnl ========================================================
|
||||
MOZ_ARG_HEADER(Components and Features)
|
||||
|
||||
@ -4981,7 +4981,7 @@ MOZ_ARG_ENABLE_STRING(ui-locale,
|
||||
AC_SUBST(MOZ_UI_LOCALE)
|
||||
|
||||
dnl ========================================================
|
||||
dnl = Trademarked Branding
|
||||
dnl = Trademarked Branding
|
||||
dnl ========================================================
|
||||
MOZ_ARG_ENABLE_BOOL(official-branding,
|
||||
[ --enable-official-branding
|
||||
@ -5141,7 +5141,7 @@ then
|
||||
|
||||
if test "$MOZ_ENABLE_GIO" -a "$MOZ_ENABLE_GTK2"
|
||||
then
|
||||
PKG_CHECK_MODULES(_GTKCHECK, gtk+-2.0 >= 2.14, ,
|
||||
PKG_CHECK_MODULES(_GTKCHECK, gtk+-2.0 >= 2.14, ,
|
||||
[AC_MSG_ERROR([* * * Could not find gtk+-2.0 > 2.14. Required for build with gio.])])
|
||||
PKG_CHECK_MODULES(MOZ_GIO, gio-2.0 >= $GIO_VERSION,[
|
||||
MOZ_GIO_LIBS=`echo $MOZ_GIO_LIBS | sed 's/-llinc\>//'`
|
||||
@ -5159,7 +5159,7 @@ then
|
||||
AC_SUBST(MOZ_ENABLE_GIO)
|
||||
AC_SUBST(MOZ_GIO_CFLAGS)
|
||||
AC_SUBST(MOZ_GIO_LIBS)
|
||||
|
||||
|
||||
dnl ========================================================
|
||||
dnl = GConf support module
|
||||
dnl ========================================================
|
||||
@ -5251,7 +5251,7 @@ dnl ========================================================
|
||||
dnl = GNOME component (mozgnome)
|
||||
dnl ========================================================
|
||||
|
||||
# The GNOME component is built if one of
|
||||
# The GNOME component is built if one of
|
||||
# gnome-vfs, gio, gconf or libnotify is available.
|
||||
if test "$MOZ_ENABLE_GCONF" -o \
|
||||
"$MOZ_ENABLE_GNOMEVFS" -o \
|
||||
@ -5389,7 +5389,7 @@ IBMBIDI=1
|
||||
AC_DEFINE(IBMBIDI)
|
||||
|
||||
dnl ========================================================
|
||||
dnl accessibility support on by default on all platforms
|
||||
dnl accessibility support on by default on all platforms
|
||||
dnl except OS X.
|
||||
dnl ========================================================
|
||||
MOZ_ARG_DISABLE_BOOL(accessibility,
|
||||
@ -5554,7 +5554,7 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIVE_LIBVPX"; then
|
||||
VPX_AS=$YASM
|
||||
VPX_ASM_SUFFIX=asm
|
||||
|
||||
dnl See if we have assembly on this platform.
|
||||
dnl See if we have assembly on this platform.
|
||||
case "$OS_ARCH:$CPU_ARCH" in
|
||||
Linux:x86)
|
||||
VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
|
||||
@ -6082,7 +6082,7 @@ if test -n "$MOZ_TREE_FREETYPE"; then
|
||||
fi
|
||||
AC_DEFINE(MOZ_TREE_FREETYPE)
|
||||
AC_SUBST(MOZ_TREE_FREETYPE)
|
||||
MOZ_ENABLE_CAIRO_FT=1
|
||||
MOZ_ENABLE_CAIRO_FT=1
|
||||
FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1"
|
||||
FT2_CFLAGS='-I$(topsrcdir)/modules/freetype2/include'
|
||||
CAIRO_FT_CFLAGS='-I$(topsrcdir)/modules/freetype2/include'
|
||||
@ -6459,7 +6459,7 @@ fi
|
||||
AC_SUBST(MOZ_ENABLE_LIBCONIC)
|
||||
AC_SUBST(LIBCONIC_CFLAGS)
|
||||
AC_SUBST(LIBCONIC_LIBS)
|
||||
|
||||
|
||||
dnl ========================================================
|
||||
dnl = Maemo checks
|
||||
dnl ========================================================
|
||||
@ -6798,7 +6798,7 @@ dnl ========================================================
|
||||
dnl = XRender Composite
|
||||
dnl ========================================================
|
||||
MOZ_ARG_ENABLE_BOOL(egl-xrender-composite,
|
||||
[ --enable-egl-xrender-composite
|
||||
[ --enable-egl-xrender-composite
|
||||
Enable EGL xrender composite optimizations],
|
||||
MOZ_EGL_XRENDER_COMPOSITE=1)
|
||||
|
||||
@ -6827,7 +6827,7 @@ dnl MOZ_ARG_HEADER(Features that require extra sources)
|
||||
dnl ========================================================
|
||||
dnl =
|
||||
dnl = Debugging Options
|
||||
dnl =
|
||||
dnl =
|
||||
dnl ========================================================
|
||||
MOZ_ARG_HEADER(Debugging and Optimizations)
|
||||
|
||||
@ -6868,7 +6868,7 @@ if test -n "$MOZ_DEBUG"; then
|
||||
AC_MSG_CHECKING([for valid debug flags])
|
||||
_SAVE_CFLAGS=$CFLAGS
|
||||
CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS"
|
||||
AC_TRY_COMPILE([#include <stdio.h>],
|
||||
AC_TRY_COMPILE([#include <stdio.h>],
|
||||
[printf("Hello World\n");],
|
||||
_results=yes,
|
||||
_results=no)
|
||||
@ -6918,7 +6918,7 @@ if test -n "$MOZ_OPTIMIZE"; then
|
||||
AC_MSG_CHECKING([for valid optimization flags])
|
||||
_SAVE_CFLAGS=$CFLAGS
|
||||
CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS"
|
||||
AC_TRY_COMPILE([#include <stdio.h>],
|
||||
AC_TRY_COMPILE([#include <stdio.h>],
|
||||
[printf("Hello World\n");],
|
||||
_results=yes,
|
||||
_results=no)
|
||||
@ -7109,7 +7109,7 @@ if test -z "$MOZ_MEMORY"; then
|
||||
;;
|
||||
esac
|
||||
else
|
||||
dnl Don't try to run compiler tests on Windows
|
||||
dnl Don't try to run compiler tests on Windows
|
||||
if test "$OS_ARCH" = "WINNT"; then
|
||||
if test -z "$HAVE_64BIT_OS"; then
|
||||
AC_DEFINE_UNQUOTED([MOZ_MEMORY_SIZEOF_PTR_2POW], 2)
|
||||
@ -7445,15 +7445,15 @@ if test -n "$STDCXX_COMPAT"; then
|
||||
fi
|
||||
|
||||
dnl ========================================================
|
||||
dnl =
|
||||
dnl =
|
||||
dnl = Profiling and Instrumenting
|
||||
dnl =
|
||||
dnl =
|
||||
dnl ========================================================
|
||||
MOZ_ARG_HEADER(Profiling and Instrumenting)
|
||||
|
||||
dnl ========================================================
|
||||
dnl = Enable NS_FUNCTION_TIMER, which provides Function
|
||||
dnl = timing for identifying code bottlenecks
|
||||
dnl = Enable NS_FUNCTION_TIMER, which provides Function
|
||||
dnl = timing for identifying code bottlenecks
|
||||
dnl = NS_FUNCTION_TIMER is off by default.
|
||||
dnl ========================================================
|
||||
MOZ_ARG_ENABLE_BOOL(functiontimer,
|
||||
@ -7483,7 +7483,7 @@ MOZ_ARG_ENABLE_BOOL(codesighs,
|
||||
_ENABLE_CODESIGHS=1,
|
||||
_ENABLE_CODESIGHS= )
|
||||
if test -n "$_ENABLE_CODESIGHS"; then
|
||||
if test -d $srcdir/tools/codesighs; then
|
||||
if test -d $srcdir/tools/codesighs; then
|
||||
MOZ_MAPINFO=1
|
||||
else
|
||||
AC_MSG_ERROR([Codesighs directory $srcdir/tools/codesighs required.])
|
||||
@ -7526,7 +7526,7 @@ fi
|
||||
dnl ========================================================
|
||||
dnl =
|
||||
dnl = Misc. Options
|
||||
dnl =
|
||||
dnl =
|
||||
dnl ========================================================
|
||||
MOZ_ARG_HEADER(Misc. Options)
|
||||
|
||||
@ -7550,7 +7550,7 @@ if test -z "$MOZ_CHROME_FILE_FORMAT"; then
|
||||
MOZ_CHROME_FILE_FORMAT=jar
|
||||
fi
|
||||
|
||||
if test "$MOZ_CHROME_FILE_FORMAT" != "jar" &&
|
||||
if test "$MOZ_CHROME_FILE_FORMAT" != "jar" &&
|
||||
test "$MOZ_CHROME_FILE_FORMAT" != "flat" &&
|
||||
test "$MOZ_CHROME_FILE_FORMAT" != "symlink" &&
|
||||
test "$MOZ_CHROME_FILE_FORMAT" != "both" &&
|
||||
@ -7598,7 +7598,7 @@ MOZ_ARG_WITH_STRING(user-appdir,
|
||||
[ val=`echo $withval`
|
||||
if echo "$val" | grep "\/" >/dev/null; then
|
||||
AC_MSG_ERROR("Homedir must be single relative path.")
|
||||
else
|
||||
else
|
||||
MOZ_USER_DIR="$val"
|
||||
fi])
|
||||
|
||||
@ -7618,7 +7618,7 @@ AC_SUBST(MOZ_DOC_INPUT_DIRS)
|
||||
dnl Use commas to specify multiple dirs to this arg
|
||||
MOZ_DOC_INCLUDE_DIRS='./dist/include ./dist/include/nspr'
|
||||
MOZ_ARG_WITH_STRING(doc-include-dirs,
|
||||
[ --with-doc-include-dirs=DIRS
|
||||
[ --with-doc-include-dirs=DIRS
|
||||
Include dirs to preprocess doc headers],
|
||||
[ MOZ_DOC_INCLUDE_DIRS=`echo "$withval" | sed "s/,/ /g"` ] )
|
||||
AC_SUBST(MOZ_DOC_INCLUDE_DIRS)
|
||||
@ -7634,7 +7634,7 @@ if test -z "$SKIP_COMPILER_CHECKS"; then
|
||||
dnl ========================================================
|
||||
dnl =
|
||||
dnl = Compiler Options
|
||||
dnl =
|
||||
dnl =
|
||||
dnl ========================================================
|
||||
MOZ_ARG_HEADER(Compiler Options)
|
||||
|
||||
@ -7762,13 +7762,13 @@ AC_CACHE_CHECK(for correct overload resolution with const and templates,
|
||||
public:
|
||||
T* myPtr;
|
||||
};
|
||||
|
||||
|
||||
template <class T, class U>
|
||||
int operator==(const Pointer<T>& rhs, U* lhs)
|
||||
{
|
||||
return rhs.myPtr == lhs;
|
||||
}
|
||||
|
||||
|
||||
template <class T, class U>
|
||||
int operator==(const Pointer<T>& rhs, const U* lhs)
|
||||
{
|
||||
@ -7807,7 +7807,7 @@ fi
|
||||
|
||||
AC_SUBST(_MOZ_EXCEPTIONS_FLAGS_ON)
|
||||
|
||||
# OSF native compilers do not like exception declarations
|
||||
# OSF native compilers do not like exception declarations
|
||||
# when exceptions are disabled
|
||||
if test -n "$COMPAQ_CXX" -o -n "$VACPP"; then
|
||||
AC_DEFINE(CPP_THROW_NEW, [])
|
||||
@ -7954,7 +7954,7 @@ XPCOM_LIBS="$LIBXUL_LIBS"
|
||||
dnl ========================================================
|
||||
dnl =
|
||||
dnl = Standalone module options
|
||||
dnl =
|
||||
dnl =
|
||||
dnl ========================================================
|
||||
MOZ_ARG_HEADER(Standalone module options (Not for building Mozilla))
|
||||
|
||||
@ -8020,7 +8020,7 @@ then
|
||||
fi
|
||||
else
|
||||
_LIBIDL_PREFIX_DIR=$MOZ_TOOLS_DIR
|
||||
fi
|
||||
fi
|
||||
if test ! -f "${_LIBIDL_PREFIX_DIR}/include/libIDL/IDL.h"; then
|
||||
AC_MSG_ERROR([Cannot find $_LIBIDL_PREFIX_DIR/include/libIDL/IDL.h .])
|
||||
fi
|
||||
@ -8039,7 +8039,7 @@ then
|
||||
esac
|
||||
|
||||
if test -z "$_LIBIDL_FOUND"; then
|
||||
if test "$MACOS_SDK_DIR"; then
|
||||
if test "$MACOS_SDK_DIR"; then
|
||||
dnl xpidl, and therefore libIDL, is only needed on the build host.
|
||||
dnl Don't build it against the SDK, as that causes problems.
|
||||
_MACSAVE_CFLAGS="$CFLAGS"
|
||||
@ -8066,7 +8066,7 @@ then
|
||||
fi
|
||||
fi
|
||||
dnl
|
||||
dnl If we don't have a libIDL config program & not cross-compiling,
|
||||
dnl If we don't have a libIDL config program & not cross-compiling,
|
||||
dnl look for orbit-config instead.
|
||||
dnl
|
||||
if test -z "$_LIBIDL_FOUND" -a -z "$CROSS_COMPILE"; then
|
||||
@ -8823,7 +8823,7 @@ if test "$USING_HCC"; then
|
||||
AC_SUBST(CXX)
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING([for posix_fallocate])
|
||||
AC_MSG_CHECKING([for posix_fallocate])
|
||||
AC_TRY_LINK([#define _XOPEN_SOURCE 600
|
||||
#include <fcntl.h>],
|
||||
[posix_fallocate(0, 0, 0);],
|
||||
@ -8858,7 +8858,7 @@ if test "$MOZ_X11"; then
|
||||
fprintf(stderr, ": can't open %s\n", XDisplayName(NULL));
|
||||
exit(1);
|
||||
}
|
||||
], [],
|
||||
], [],
|
||||
[ AC_MSG_ERROR([Could not compile basic X program.]) ])
|
||||
CFLAGS="$_SAVE_CFLAGS"
|
||||
|
||||
@ -8881,7 +8881,7 @@ if test "$USE_FC_FREETYPE"; then
|
||||
if test "$COMPILE_ENVIRONMENT"; then
|
||||
_SAVE_CPPFLAGS="$CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $FT2_CFLAGS $XCFLAGS"
|
||||
AC_CHECK_HEADERS(fontconfig/fcfreetype.h, ,
|
||||
AC_CHECK_HEADERS(fontconfig/fcfreetype.h, ,
|
||||
[AC_MSG_ERROR(Can't find header fontconfig/fcfreetype.h.)])
|
||||
CPPFLAGS="$_SAVE_CPPFLAGS"
|
||||
else
|
||||
@ -9051,7 +9051,7 @@ dnl Load the list of Makefiles to generate.
|
||||
dnl To add new Makefiles, edit allmakefiles.sh.
|
||||
dnl allmakefiles.sh sets the variable, MAKEFILES.
|
||||
. ${srcdir}/allmakefiles.sh
|
||||
dnl
|
||||
dnl
|
||||
dnl Run a perl script to quickly create the makefiles.
|
||||
dnl If it succeeds, it outputs a shell command to set CONFIG_FILES
|
||||
dnl for the files it cannot handle correctly. This way, config.status
|
||||
@ -9107,13 +9107,13 @@ dnl ========================================================
|
||||
dnl = Setup a nice relatively clean build environment for
|
||||
dnl = sub-configures.
|
||||
dnl ========================================================
|
||||
CC="$_SUBDIR_CC"
|
||||
CXX="$_SUBDIR_CXX"
|
||||
CFLAGS="$_SUBDIR_CFLAGS"
|
||||
CC="$_SUBDIR_CC"
|
||||
CXX="$_SUBDIR_CXX"
|
||||
CFLAGS="$_SUBDIR_CFLAGS"
|
||||
CPPFLAGS="$_SUBDIR_CPPFLAGS"
|
||||
CXXFLAGS="$_SUBDIR_CXXFLAGS"
|
||||
LDFLAGS="$_SUBDIR_LDFLAGS"
|
||||
HOST_CC="$_SUBDIR_HOST_CC"
|
||||
HOST_CC="$_SUBDIR_HOST_CC"
|
||||
HOST_CFLAGS="$_SUBDIR_HOST_CFLAGS"
|
||||
HOST_LDFLAGS="$_SUBDIR_HOST_LDFLAGS"
|
||||
RC=
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user