author | Neil Rashbrook <neil@parkwaycc.co.uk> |
Tue, 01 Mar 2011 21:38:21 +1100 | |
changeset 63478 | 670701b7c645ba0819886cfae46ee92306b00aee |
parent 63477 | 166a01bd23f547eac28fec06166733f71edec092 |
child 63479 | 16432839ea97a68cbc8c571d0061b96181dc3dc8 |
push id | 19231 |
push user | khuey@kylehuey.com |
push date | Wed, 23 Mar 2011 00:22:04 +0000 |
treeherder | mozilla-central@57a0f8967cce [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | ted |
bugs | 632344 |
milestone | 2.0b13pre |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
aclocal.m4 | file | annotate | diff | comparison | revisions | |
build/autoconf/mozheader.m4 | file | annotate | diff | comparison | revisions | |
configure.in | file | annotate | diff | comparison | revisions |
--- a/aclocal.m4 +++ b/aclocal.m4 @@ -7,16 +7,17 @@ builtin(include, build/autoconf/glib.m4) builtin(include, build/autoconf/libIDL.m4)dnl builtin(include, build/autoconf/nspr.m4)dnl builtin(include, build/autoconf/nss.m4)dnl builtin(include, build/autoconf/pkg.m4)dnl builtin(include, build/autoconf/freetype2.m4)dnl builtin(include, build/autoconf/codeset.m4)dnl builtin(include, build/autoconf/altoptions.m4)dnl builtin(include, build/autoconf/mozprog.m4)dnl +builtin(include, build/autoconf/mozheader.m4)dnl builtin(include, build/autoconf/acwinpaths.m4)dnl MOZ_PROG_CHECKMSYS() # Read the user's .mozconfig script. We can't do this in # configure.in: autoconf puts the argument parsing code above anything # expanded from configure.in, and we need to get the configure options # from .mozconfig in place before that argument parsing code.
new file mode 100644 --- /dev/null +++ b/build/autoconf/mozheader.m4 @@ -0,0 +1,65 @@ +dnl ***** BEGIN LICENSE BLOCK ***** +dnl Version: MPL 1.1/GPL 2.0/LGPL 2.1 +dnl +dnl The contents of this file are subject to the Mozilla Public License Version +dnl 1.1 (the "License"); you may not use this file except in compliance with +dnl the License. You may obtain a copy of the License at +dnl http://www.mozilla.org/MPL/ +dnl +dnl Software distributed under the License is distributed on an "AS IS" basis, +dnl WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +dnl for the specific language governing rights and limitations under the +dnl License. +dnl +dnl The Original Code is mozilla.org code. +dnl +dnl The Initial Developer of the Original Code is the +dnl Mozilla Foundation <http://www.mozilla.org> +dnl +dnl Portions created by the Initial Developer are Copyright (C) 2009 +dnl the Initial Developer. All Rights Reserved. +dnl +dnl Contributor(s): +dnl Neil Rashbrook <neil@parkwaycc.co.uk> +dnl +dnl Alternatively, the contents of this file may be used under the terms of +dnl either of the GNU General Public License Version 2 or later (the "GPL"), +dnl or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +dnl in which case the provisions of the GPL or the LGPL are applicable instead +dnl of those above. If you wish to allow use of your version of this file only +dnl under the terms of either the GPL or the LGPL, and not to allow others to +dnl use your version of this file under the terms of the MPL, indicate your +dnl decision by deleting the provisions above and replace them with the notice +dnl and other provisions required by the GPL or the LGPL. If you do not delete +dnl the provisions above, a recipient may use your version of this file under +dnl the terms of any one of the MPL, the GPL or the LGPL. +dnl +dnl ***** END LICENSE BLOCK ***** + +dnl MOZ_CHECK_HEADER(HEADER-FILE, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +AC_DEFUN(MOZ_CHECK_HEADER, +[ dnl Do the transliteration at runtime so arg 1 can be a shell variable. + ac_safe=`echo "$1" | sed 'y%./+-%__p_%'` + AC_MSG_CHECKING([for $1]) + AC_CACHE_VAL(ac_cv_header_$ac_safe, + [ AC_TRY_COMPILE([#include <$1>], , + eval "ac_cv_header_$ac_safe=yes", + eval "ac_cv_header_$ac_safe=no") ]) + if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + ifelse([$3], , , [$3]) + fi +]) + +dnl MOZ_CHECK_HEADERS(HEADER-FILE... [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +AC_DEFUN(MOZ_CHECK_HEADERS, +[ for ac_hdr in $1 + do + MOZ_CHECK_HEADER($ac_hdr, + [ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + AC_DEFINE_UNQUOTED($ac_tr_hdr) $2], $3) + done +])
--- a/configure.in +++ b/configure.in @@ -740,17 +740,17 @@ case "$target" in *) AC_MSG_RESULT([none needed]) ;; esac # Identify which version of the SDK we're building with # Windows Server 2008 and newer SDKs have WinSDKVer.h, get the version # from there - AC_CHECK_HEADERS([winsdkver.h]) + MOZ_CHECK_HEADERS([winsdkver.h]) if test "$ac_cv_header_winsdkver_h" = "yes"; then # Get the highest _WIN32_WINNT and NTDDI versions supported # Take the higher of the two # This is done because the Windows 7 beta SDK reports its # NTDDI_MAXVER to be 0x06000100 instead of 0x06010000, as it should AC_CACHE_CHECK(for highest Windows version supported by this SDK, ac_cv_winsdk_maxver, [cat > conftest.h <<EOF @@ -767,17 +767,17 @@ WINSDK_MAXVER EOF ac_cv_winsdk_maxver=`$CPP conftest.h 2>/dev/null | tail -n1` rm -f conftest.h ]) MOZ_WINSDK_MAXVER=${ac_cv_winsdk_maxver} else # The Vista SDK is the only one to have sdkddkver.h but not # WinSDKVer.h - AC_CHECK_HEADERS([sdkddkver.h]) + MOZ_CHECK_HEADERS([sdkddkver.h]) if test "$ac_cv_header_sdkddkver_h" = "yes"; then MOZ_WINSDK_MAXVER=0x06000000 else # Assume the Server 2003 Platform SDK MOZ_WINSDK_MAXVER=0x05020000 fi fi @@ -1132,17 +1132,17 @@ tools are selected during the Xcode/Deve GCC_VERSION_MAJOR=`echo $GCC_VERSION_FULL | $PERL -pe 's/(^\d*).*/$1/;'` if test "$GCC_VERSION_MAJOR" -lt "4" ; then AC_MSG_ERROR([You need to upgrade the compiler version to 4.x]) else CFLAGS="$CFLAGS -isysroot ${MACOS_SDK_DIR}" CXXFLAGS="$CXXFLAGS -isysroot ${MACOS_SDK_DIR}" - dnl CPP/CXXCPP needs to be set for AC_CHECK_HEADER. + dnl CPP/CXXCPP needs to be set for MOZ_CHECK_HEADER. CPP="$CPP -isysroot ${MACOS_SDK_DIR}" CXXCPP="$CXXCPP -isysroot ${MACOS_SDK_DIR}" if test "$GCC_VERSION_FULL" = "4.0.0" ; then dnl If gcc >= 4.0, we're guaranteed to be on Tiger, which has an ld dnl that supports -syslibroot. Don't set NEXT_ROOT because it will dnl be ignored and cause warnings when -syslibroot is specified. dnl gcc 4.0.1 will pass -syslibroot to ld automatically based on @@ -1840,17 +1840,17 @@ MOZ_ARG_ENABLE_BOOL(profiling, dnl ======================================================== dnl = Use Valgrind dnl ======================================================== MOZ_ARG_ENABLE_BOOL(valgrind, [ --enable-valgrind Enable Valgrind integration hooks (default=no)], MOZ_VALGRIND=1, MOZ_VALGRIND= ) if test -n "$MOZ_VALGRIND"; then - AC_CHECK_HEADER([valgrind/valgrind.h], [], + MOZ_CHECK_HEADER([valgrind/valgrind.h], [], AC_MSG_ERROR( [--enable-valgrind specified but Valgrind is not installed])) AC_DEFINE(MOZ_VALGRIND) fi dnl ======================================================== dnl jprof dnl ======================================================== @@ -2041,17 +2041,17 @@ case "$target" in fi fi case "${target_os}" in aix4.1*) DLL_SUFFIX='_shr.a' ;; esac if test "$COMPILE_ENVIRONMENT"; then - AC_CHECK_HEADERS(sys/inttypes.h) + MOZ_CHECK_HEADERS(sys/inttypes.h) fi AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES) ;; *-bsdi*) dnl -pedantic doesn't play well with BSDI's _very_ modified gcc (shlicc2) _PEDANTIC= case $OS_RELEASE in @@ -2353,17 +2353,17 @@ ia64*-hpux*) BIN_SUFFIX='.exe' MOZ_USER_DIR="Mozilla" MOZ_GFX_OPTIMIZE_MOBILE=1 # Sanity check for WINCE_WINDOWS_MOBILE # XXX disabled until we can fix the mobile tinderbox ##if test "$WINCE_WINDOWS_MOBILE"; then - ## AC_CHECK_HEADER(tpcshell.h, [], + ## MOZ_CHECK_HEADER(tpcshell.h, [], ## AC_MSG_ERROR([Can't find tpcshell.h in your SDK; are you sure you don't need --disable-windows-mobile-components?])) ##fi ;; *-mingw*) DSO_CFLAGS= DSO_PIC_CFLAGS= DLL_SUFFIX=.dll @@ -2509,17 +2509,17 @@ ia64*-hpux*) case "$host_os" in cygwin*|msvc*|mks*) AC_MSG_ERROR([Using a Cygwin build environment is unsupported. Configure cannot check for presence of necessary headers. Please upgrade to MozillaBuild; see https://developer.mozilla.org/en/Windows_Build_Prerequisites.]) ;; *) AC_CHECK_HEADERS(oleacc.idl) AC_LANG_SAVE AC_LANG_CPLUSPLUS - AC_CHECK_HEADERS(atlbase.h) + MOZ_CHECK_HEADERS(atlbase.h) AC_LANG_RESTORE ;; esac case "$target" in i*86-*) if test "$HAVE_64BIT_OS"; then AC_MSG_ERROR([You are targeting i386 but using the 64-bit compiler.]) @@ -2529,17 +2529,17 @@ ia64*-hpux*) LDFLAGS="$LDFLAGS -SAFESEH" fi if test -n "$GNU_CC"; then CFLAGS="$CFLAGS -mstackrealign" CXXFLAGS="$CXXFLAGS -mstackrealign" fi - AC_CHECK_HEADERS(mmintrin.h) + MOZ_CHECK_HEADERS(mmintrin.h) AC_DEFINE(_X86_) ;; alpha-*) AC_DEFINE(_ALPHA_) ;; mips-*) AC_DEFINE(_MIPS_) ;; @@ -3350,61 +3350,61 @@ dnl Checks for header files. dnl ======================================================== AC_HEADER_DIRENT case "$target_os" in freebsd*) # for stuff like -lXshm CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}" ;; esac -AC_CHECK_HEADERS(sys/byteorder.h compat.h getopt.h) -AC_CHECK_HEADERS(sys/bitypes.h memory.h unistd.h) -AC_CHECK_HEADERS(gnu/libc-version.h nl_types.h) -AC_CHECK_HEADERS(malloc.h) -AC_CHECK_HEADERS(X11/XKBlib.h) -AC_CHECK_HEADERS(io.h) +MOZ_CHECK_HEADERS(sys/byteorder.h compat.h getopt.h) +MOZ_CHECK_HEADERS(sys/bitypes.h memory.h unistd.h) +MOZ_CHECK_HEADERS(gnu/libc-version.h nl_types.h) +MOZ_CHECK_HEADERS(malloc.h) +MOZ_CHECK_HEADERS(X11/XKBlib.h) +MOZ_CHECK_HEADERS(io.h) dnl These are all the places some variant of statfs can be hiding. -AC_CHECK_HEADERS(sys/statvfs.h sys/statfs.h sys/vfs.h sys/mount.h) +MOZ_CHECK_HEADERS(sys/statvfs.h sys/statfs.h sys/vfs.h sys/mount.h) dnl Quota support -AC_CHECK_HEADERS(sys/quota.h) -AC_CHECK_HEADERS(linux/quota.h) +MOZ_CHECK_HEADERS(sys/quota.h) +MOZ_CHECK_HEADERS(linux/quota.h) dnl Try for MMX support dnl NB - later gcc versions require -mmmx for this header to be successfully dnl included (or another option which implies it, such as -march=pentium-mmx) -AC_CHECK_HEADERS(mmintrin.h) +MOZ_CHECK_HEADERS(mmintrin.h) dnl Check whether the compiler supports the new-style C++ standard dnl library headers (i.e. <new>) or needs the old "new.h" AC_LANG_CPLUSPLUS NEW_H=new.h -AC_CHECK_HEADER(new, [NEW_H=new]) +MOZ_CHECK_HEADER(new, [NEW_H=new]) AC_DEFINE_UNQUOTED(NEW_H, <$NEW_H>) AC_LANG_C AC_ARG_ENABLE(dtrace, [ --enable-dtrace build with dtrace support if available (default=no)], [enable_dtrace="yes"],) if test "x$enable_dtrace" = "xyes"; then - AC_CHECK_HEADER(sys/sdt.h, HAVE_DTRACE=1) + MOZ_CHECK_HEADER(sys/sdt.h, HAVE_DTRACE=1) if test -n "$HAVE_DTRACE"; then AC_DEFINE(INCLUDE_MOZILLA_DTRACE) else AC_MSG_ERROR([dtrace enabled but sys/sdt.h not found]); fi fi AC_SUBST(HAVE_DTRACE) case $target in *-aix4.3*|*-aix5*) ;; *) - AC_CHECK_HEADERS(sys/cdefs.h) + MOZ_CHECK_HEADERS(sys/cdefs.h) ;; esac dnl Checks for libraries. dnl ======================================================== case $target in *-hpux11.*) ;; @@ -3421,17 +3421,17 @@ dnl they both are just symlinks to libSy dnl against libSystem causes issues when debugging (see bug 299601). case $target in *-darwin*) ;; *-os2*) ;; *) AC_SEARCH_LIBS(dlopen, dl, - AC_CHECK_HEADER(dlfcn.h, + MOZ_CHECK_HEADER(dlfcn.h, AC_DEFINE(HAVE_DLOPEN))) ;; esac _SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -D_GNU_SOURCE" AC_CHECK_FUNCS(dladdr) CFLAGS="$_SAVE_CFLAGS" @@ -3511,36 +3511,36 @@ else ;; esac dnl ======================================================== dnl = Check for XShm dnl ======================================================== AC_CHECK_LIB(Xext, XShmCreateImage, _HAVE_XSHM_XEXT=1,, $XLIBS $XEXT_LIBS) - AC_CHECK_HEADER(X11/extensions/XShm.h) + MOZ_CHECK_HEADER(X11/extensions/XShm.h) if test "$ac_cv_header_X11_extensions_XShm_h" = "yes" && test -n "$_HAVE_XSHM_XEXT"; then AC_DEFINE(HAVE_XSHM) fi dnl ======================================================== dnl = Check for Xss dnl ======================================================== - AC_CHECK_HEADER(X11/extensions/scrnsaver.h, + MOZ_CHECK_HEADER(X11/extensions/scrnsaver.h, AC_CHECK_LIB(Xss, XScreenSaverQueryInfo, [XSS_LIBS="-lXss $XEXT_LIBS $XLIBS" AC_DEFINE(HAVE_LIBXSS)],, $XEXT_LIBS $XLIBS)) dnl ======================================================== dnl = Check for XIE dnl ======================================================== AC_CHECK_LIB(XIE, XieFloGeometry, [MOZ_XIE_LIBS="-lXIE"],, $XLIBS $XEXT_LIBS) - AC_CHECK_HEADER(X11/extensions/XIElib.h) + MOZ_CHECK_HEADER(X11/extensions/XIElib.h) if test "$MOZ_XIE_LIBS"; then dnl ==================================================== dnl = If XIE is present and is desired, turn it on dnl ==================================================== case $target in *-hpux*) ;; @@ -4461,21 +4461,21 @@ if test "$ac_cv_thread_keyword" = yes; t AC_DEFINE(HAVE_THREAD_TLS_KEYWORD) ;; esac fi dnl Check for the existence of various allocation headers/functions MALLOC_H= -AC_CHECK_HEADER(malloc.h, [MALLOC_H=malloc.h]) +MOZ_CHECK_HEADER(malloc.h, [MALLOC_H=malloc.h]) if test "$MALLOC_H" = ""; then - AC_CHECK_HEADER(malloc/malloc.h, [MALLOC_H=malloc/malloc.h]) + MOZ_CHECK_HEADER(malloc/malloc.h, [MALLOC_H=malloc/malloc.h]) if test "$MALLOC_H" = ""; then - AC_CHECK_HEADER(sys/malloc.h, [MALLOC_H=sys/malloc.h]) + MOZ_CHECK_HEADER(sys/malloc.h, [MALLOC_H=sys/malloc.h]) fi fi if test "$MALLOC_H" != ""; then AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) fi MOZ_ALLOCATING_FUNCS="strndup posix_memalign memalign valloc" AC_CHECK_FUNCS(strndup posix_memalign memalign valloc) @@ -4677,21 +4677,21 @@ MOZ_ARG_WITH_STRING(system-libevent, if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then MOZ_NATIVE_LIBEVENT= else if test "${LIBEVENT_DIR}" = "yes"; then LIBEVENT_DIR=/usr fi CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS" LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS" - AC_CHECK_HEADER(event.h, - [if test ! -f "${LIBEVENT_DIR}/include/event.h"; then - AC_MSG_ERROR([event.h found, but is not in ${LIBEVENT_DIR}/include]) - fi], - AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) + MOZ_CHECK_HEADER(event.h, + [if test ! -f "${LIBEVENT_DIR}/include/event.h"; then + AC_MSG_ERROR([event.h found, but is not in ${LIBEVENT_DIR}/include]) + fi], + AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) AC_CHECK_LIB(event, event_init, [MOZ_NATIVE_LIBEVENT=1 MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) fi CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS @@ -6038,21 +6038,21 @@ if test -n "$MOZ_WEBM"; then _SAVE_CFLAGS=$CFLAGS _SAVE_LDFLAGS=$LDFLAGS _SAVE_LIBS=$LIBS if test "${LIBVPX_DIR}" = "yes"; then LIBVPX_DIR=/usr fi CFLAGS="-I${LIBVPX_DIR}/include $CFLAGS" LDFLAGS="-L${LIBVPX_DIR}/lib $LDFLAGS" - AC_CHECK_HEADER(vpx/vpx_decoder.h, - [if test ! -f "${LIBVPX_DIR}/include/vpx/vpx_decoder.h"; then - AC_MSG_ERROR([vpx/vpx_decoder.h found, but is not in ${LIBVPX_DIR}/include]) - fi], - AC_MSG_ERROR([--with-system-libvpx requested but vpx/vpx_decoder.h not found])) + MOZ_CHECK_HEADER(vpx/vpx_decoder.h, + [if test ! -f "${LIBVPX_DIR}/include/vpx/vpx_decoder.h"; then + AC_MSG_ERROR([vpx/vpx_decoder.h found, but is not in ${LIBVPX_DIR}/include]) + fi], + AC_MSG_ERROR([--with-system-libvpx requested but vpx/vpx_decoder.h not found])) AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, [MOZ_NATIVE_LIBVPX=1 MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include" MOZ_LIBVPX_LIBS="-L${LIBVPX_DIR}/lib -lvpx"], ([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])) CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS @@ -6443,17 +6443,17 @@ if test -n "$MOZ_CRASHREPORTER"; then AC_DEFINE(MOZ_CRASHREPORTER) if (test "$OS_TARGET" = "Linux" -o "$OS_ARCH" = "SunOS") && \ test -z "$SKIP_LIBRARY_CHECKS"; then PKG_CHECK_MODULES(MOZ_GTHREAD, gthread-2.0) AC_SUBST(MOZ_GTHREAD_CFLAGS) AC_SUBST(MOZ_GTHREAD_LIBS) - AC_CHECK_HEADERS([curl/curl.h], [], [AC_MSG_ERROR([Couldn't find curl/curl.h which is required for the crash reporter. Use --disable-crashreporter to disable the crash reporter.])]) + MOZ_CHECK_HEADERS([curl/curl.h], [], [AC_MSG_ERROR([Couldn't find curl/curl.h which is required for the crash reporter. Use --disable-crashreporter to disable the crash reporter.])]) fi fi MOZ_ARG_WITH_STRING(crashreporter-enable-percent, [ --with-crashreporter-enable-percent=NN Enable sending crash reports by default on NN% of users. (default=100)], [ val=`echo $withval | sed 's/[^0-9]//g'` MOZ_CRASHREPORTER_ENABLE_PERCENT="$val"]) @@ -7093,18 +7093,18 @@ if test $MOZ_PLATFORM_MAEMO; then fi MOZ_GFX_OPTIMIZE_MOBILE=1 MOZ_WEBGL_GLX= MOZ_MAEMO_LIBLOCATION= if test $MOZ_PLATFORM_MAEMO = 5; then dnl if we have Xcomposite we should also have Xdamage and Xfixes - AC_CHECK_HEADERS([X11/extensions/Xdamage.h], [], - [AC_MSG_ERROR([Couldn't find X11/extensions/Xdamage.h which is required for composited plugins.])]) + MOZ_CHECK_HEADERS([X11/extensions/Xdamage.h], [], + [AC_MSG_ERROR([Couldn't find X11/extensions/Xdamage.h which is required for composited plugins.])]) AC_CHECK_LIB(Xcomposite, XCompositeRedirectWindow, [XCOMPOSITE_LIBS="-lXcomposite -lXdamage -lXfixes"], [MISSING_X="$MISSING_X -lXcomposite"], $XLIBS) AC_SUBST(XCOMPOSITE_LIBS) PKG_CHECK_MODULES(LIBHILDONMIME,libhildonmime, _LIB_FOUND=1, _LIB_FOUND=) MOZ_PLATFORM_MAEMO_LIBS="$MOZ_PLATFORM_MAEMO_LIBS $LIBHILDONMIME_LIBS" MOZ_PLATFORM_MAEMO_CFLAGS="$MOZ_PLATFORM_MAEMO_CFLAGS $LIBHILDONMIME_CFLAGS" @@ -7832,17 +7832,17 @@ if test "$HAVE_DEMANGLE" -a "$HAVE_GCC3_ AC_DEFINE(MOZ_DEMANGLE_SYMBOLS) fi AC_SUBST(MOZ_DEMANGLE_SYMBOLS) dnl ======================================================== dnl = Support for gcc stack unwinding (from gcc 3.3) dnl ======================================================== if test "$HAVE_GCC3_ABI" -a -z "$SKIP_LIBRARY_CHECKS"; then - AC_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace)) + MOZ_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace)) fi dnl ======================================================== dnl = dnl = Misc. Options dnl = dnl ======================================================== MOZ_ARG_HEADER(Misc. Options) @@ -8611,17 +8611,17 @@ MOZ_TREE_CAIRO=1 ) MOZ_TREE_PIXMAN=1 MOZ_ARG_ENABLE_BOOL(system-pixman, [ --enable-system-pixman Use system pixman (located with pkgconfig)], MOZ_TREE_PIXMAN=, MOZ_TREE_PIXMAN=1 ) # Check for headers defining standard int types. -AC_CHECK_HEADERS(stdint.h inttypes.h sys/int_types.h) +MOZ_CHECK_HEADERS(stdint.h inttypes.h sys/int_types.h) if test "$MOZ_TREE_CAIRO"; then AC_DEFINE(MOZ_TREE_CAIRO) # For now we assume that we will have a uint64_t available through # one of the above headers or mozstdint.h. AC_DEFINE(HAVE_UINT64_T) @@ -8656,21 +8656,21 @@ if test "$MOZ_TREE_CAIRO"; then WIN32_D2D_SURFACE_FEATURE= fi else WIN32_FONT_FEATURE= WIN32_DWRITE_FONT_FEATURE= WIN32_D2D_SURFACE_FEATURE= fi - AC_CHECK_HEADER(d3d9.h, MOZ_ENABLE_D3D9_LAYER=1) + MOZ_CHECK_HEADER(d3d9.h, MOZ_ENABLE_D3D9_LAYER=1) dnl D3D10 Layers depend on D2D Surfaces. if test -n "$WIN32_D2D_SURFACE_FEATURE"; then - AC_CHECK_HEADER(d3d10.h, MOZ_ENABLE_D3D10_LAYER=1) + MOZ_CHECK_HEADER(d3d10.h, MOZ_ENABLE_D3D10_LAYER=1) fi fi if test "$MOZ_WIDGET_TOOLKIT" = "os2"; then OS2_SURFACE_FEATURE="#define CAIRO_HAS_OS2_SURFACE 1" FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1" MOZ_ENABLE_CAIRO_FT=1 CAIRO_FT_CFLAGS="-I${MZFTCFGFT2}/include" @@ -8873,17 +8873,17 @@ if test "$NECKO_WIFI" -a \ "$OS_ARCH" != "SunOS" -a \ "$OS_ARCH" != "WINNT" -a \ "$OS_ARCH" != "WINCE"; then AC_MSG_ERROR([Necko WiFi scanning not supported on your platform, use --disable-necko-wifi]) fi if test -z "$SKIP_LIBRARY_CHECKS" -a "$NECKO_WIFI" -a "$OS_ARCH" = "Linux" then - AC_CHECK_HEADER([iwlib.h]) + MOZ_CHECK_HEADER([iwlib.h]) if test "$ac_cv_header_iwlib_h" != "yes"; then AC_MSG_ERROR([Can't find header iwlib.h for Necko WiFi scanning (might be in package libiw-dev (Ubuntu) or wireless-tools-devel (Fedora)); use --disable-necko-wifi to disable]) fi fi if test "$NECKO_WIFI"; then AC_DEFINE(NECKO_WIFI) fi @@ -9292,28 +9292,28 @@ if test "$MOZ_X11"; then if test ! -z "$MISSING_X"; then AC_MSG_ERROR([ Could not find the following X libraries: $MISSING_X ]); fi fi # MOZ_X11 dnl Check for headers, etc. needed by WebGL. if test -n "$MOZ_WEBGL_GLX"; then - AC_CHECK_HEADER(GL/glx.h) + MOZ_CHECK_HEADER(GL/glx.h) if test "$ac_cv_header_GL_glx_h" != "yes"; then AC_MSG_ERROR([Can't find header GL/glx.h for WebGL (install mesa-common-dev (Ubuntu), mesa-libGL-devel (Fedora), or Mesa (SuSE))]) fi fi # MOZ_WEBGL_GLX fi # COMPILE_ENVIRONMENT 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, , + MOZ_CHECK_HEADERS(fontconfig/fcfreetype.h, , [AC_MSG_ERROR(Can't find header fontconfig/fcfreetype.h.)]) CPPFLAGS="$_SAVE_CPPFLAGS" else AC_DEFINE(HAVE_FONTCONFIG_FCFREETYPE_H) fi fi dnl Set various defines and substitutions