mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 02:14:43 +00:00
Bug 632344 - Speed up header checks. r=ted
This commit is contained in:
parent
59020e7397
commit
c5b0864947
1
aclocal.m4
vendored
1
aclocal.m4
vendored
@ -12,6 +12,7 @@ builtin(include, build/autoconf/freetype2.m4)dnl
|
|||||||
builtin(include, build/autoconf/codeset.m4)dnl
|
builtin(include, build/autoconf/codeset.m4)dnl
|
||||||
builtin(include, build/autoconf/altoptions.m4)dnl
|
builtin(include, build/autoconf/altoptions.m4)dnl
|
||||||
builtin(include, build/autoconf/mozprog.m4)dnl
|
builtin(include, build/autoconf/mozprog.m4)dnl
|
||||||
|
builtin(include, build/autoconf/mozheader.m4)dnl
|
||||||
builtin(include, build/autoconf/acwinpaths.m4)dnl
|
builtin(include, build/autoconf/acwinpaths.m4)dnl
|
||||||
|
|
||||||
MOZ_PROG_CHECKMSYS()
|
MOZ_PROG_CHECKMSYS()
|
||||||
|
65
build/autoconf/mozheader.m4
Normal file
65
build/autoconf/mozheader.m4
Normal file
@ -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
|
||||||
|
])
|
96
configure.in
96
configure.in
@ -745,7 +745,7 @@ case "$target" in
|
|||||||
# Identify which version of the SDK we're building with
|
# Identify which version of the SDK we're building with
|
||||||
# Windows Server 2008 and newer SDKs have WinSDKVer.h, get the version
|
# Windows Server 2008 and newer SDKs have WinSDKVer.h, get the version
|
||||||
# from there
|
# from there
|
||||||
AC_CHECK_HEADERS([winsdkver.h])
|
MOZ_CHECK_HEADERS([winsdkver.h])
|
||||||
if test "$ac_cv_header_winsdkver_h" = "yes"; then
|
if test "$ac_cv_header_winsdkver_h" = "yes"; then
|
||||||
# Get the highest _WIN32_WINNT and NTDDI versions supported
|
# Get the highest _WIN32_WINNT and NTDDI versions supported
|
||||||
# Take the higher of the two
|
# Take the higher of the two
|
||||||
@ -772,7 +772,7 @@ EOF
|
|||||||
else
|
else
|
||||||
# The Vista SDK is the only one to have sdkddkver.h but not
|
# The Vista SDK is the only one to have sdkddkver.h but not
|
||||||
# WinSDKVer.h
|
# WinSDKVer.h
|
||||||
AC_CHECK_HEADERS([sdkddkver.h])
|
MOZ_CHECK_HEADERS([sdkddkver.h])
|
||||||
if test "$ac_cv_header_sdkddkver_h" = "yes"; then
|
if test "$ac_cv_header_sdkddkver_h" = "yes"; then
|
||||||
MOZ_WINSDK_MAXVER=0x06000000
|
MOZ_WINSDK_MAXVER=0x06000000
|
||||||
else
|
else
|
||||||
@ -1137,7 +1137,7 @@ tools are selected during the Xcode/Developer Tools installation.])
|
|||||||
CFLAGS="$CFLAGS -isysroot ${MACOS_SDK_DIR}"
|
CFLAGS="$CFLAGS -isysroot ${MACOS_SDK_DIR}"
|
||||||
CXXFLAGS="$CXXFLAGS -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}"
|
CPP="$CPP -isysroot ${MACOS_SDK_DIR}"
|
||||||
CXXCPP="$CXXCPP -isysroot ${MACOS_SDK_DIR}"
|
CXXCPP="$CXXCPP -isysroot ${MACOS_SDK_DIR}"
|
||||||
|
|
||||||
@ -1845,7 +1845,7 @@ MOZ_ARG_ENABLE_BOOL(valgrind,
|
|||||||
MOZ_VALGRIND=1,
|
MOZ_VALGRIND=1,
|
||||||
MOZ_VALGRIND= )
|
MOZ_VALGRIND= )
|
||||||
if test -n "$MOZ_VALGRIND"; then
|
if test -n "$MOZ_VALGRIND"; then
|
||||||
AC_CHECK_HEADER([valgrind/valgrind.h], [],
|
MOZ_CHECK_HEADER([valgrind/valgrind.h], [],
|
||||||
AC_MSG_ERROR(
|
AC_MSG_ERROR(
|
||||||
[--enable-valgrind specified but Valgrind is not installed]))
|
[--enable-valgrind specified but Valgrind is not installed]))
|
||||||
AC_DEFINE(MOZ_VALGRIND)
|
AC_DEFINE(MOZ_VALGRIND)
|
||||||
@ -2046,7 +2046,7 @@ case "$target" in
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
if test "$COMPILE_ENVIRONMENT"; then
|
if test "$COMPILE_ENVIRONMENT"; then
|
||||||
AC_CHECK_HEADERS(sys/inttypes.h)
|
MOZ_CHECK_HEADERS(sys/inttypes.h)
|
||||||
fi
|
fi
|
||||||
AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
|
AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
|
||||||
;;
|
;;
|
||||||
@ -2358,7 +2358,7 @@ ia64*-hpux*)
|
|||||||
# Sanity check for WINCE_WINDOWS_MOBILE
|
# Sanity check for WINCE_WINDOWS_MOBILE
|
||||||
# XXX disabled until we can fix the mobile tinderbox
|
# XXX disabled until we can fix the mobile tinderbox
|
||||||
##if test "$WINCE_WINDOWS_MOBILE"; then
|
##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?]))
|
## AC_MSG_ERROR([Can't find tpcshell.h in your SDK; are you sure you don't need --disable-windows-mobile-components?]))
|
||||||
##fi
|
##fi
|
||||||
;;
|
;;
|
||||||
@ -2514,7 +2514,7 @@ ia64*-hpux*)
|
|||||||
AC_CHECK_HEADERS(oleacc.idl)
|
AC_CHECK_HEADERS(oleacc.idl)
|
||||||
AC_LANG_SAVE
|
AC_LANG_SAVE
|
||||||
AC_LANG_CPLUSPLUS
|
AC_LANG_CPLUSPLUS
|
||||||
AC_CHECK_HEADERS(atlbase.h)
|
MOZ_CHECK_HEADERS(atlbase.h)
|
||||||
AC_LANG_RESTORE
|
AC_LANG_RESTORE
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
@ -2534,7 +2534,7 @@ ia64*-hpux*)
|
|||||||
CXXFLAGS="$CXXFLAGS -mstackrealign"
|
CXXFLAGS="$CXXFLAGS -mstackrealign"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_CHECK_HEADERS(mmintrin.h)
|
MOZ_CHECK_HEADERS(mmintrin.h)
|
||||||
AC_DEFINE(_X86_)
|
AC_DEFINE(_X86_)
|
||||||
;;
|
;;
|
||||||
alpha-*)
|
alpha-*)
|
||||||
@ -3355,30 +3355,30 @@ freebsd*)
|
|||||||
CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
|
CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
AC_CHECK_HEADERS(sys/byteorder.h compat.h getopt.h)
|
MOZ_CHECK_HEADERS(sys/byteorder.h compat.h getopt.h)
|
||||||
AC_CHECK_HEADERS(sys/bitypes.h memory.h unistd.h)
|
MOZ_CHECK_HEADERS(sys/bitypes.h memory.h unistd.h)
|
||||||
AC_CHECK_HEADERS(gnu/libc-version.h nl_types.h)
|
MOZ_CHECK_HEADERS(gnu/libc-version.h nl_types.h)
|
||||||
AC_CHECK_HEADERS(malloc.h)
|
MOZ_CHECK_HEADERS(malloc.h)
|
||||||
AC_CHECK_HEADERS(X11/XKBlib.h)
|
MOZ_CHECK_HEADERS(X11/XKBlib.h)
|
||||||
AC_CHECK_HEADERS(io.h)
|
MOZ_CHECK_HEADERS(io.h)
|
||||||
|
|
||||||
dnl These are all the places some variant of statfs can be hiding.
|
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
|
dnl Quota support
|
||||||
AC_CHECK_HEADERS(sys/quota.h)
|
MOZ_CHECK_HEADERS(sys/quota.h)
|
||||||
AC_CHECK_HEADERS(linux/quota.h)
|
MOZ_CHECK_HEADERS(linux/quota.h)
|
||||||
|
|
||||||
dnl Try for MMX support
|
dnl Try for MMX support
|
||||||
dnl NB - later gcc versions require -mmmx for this header to be successfully
|
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)
|
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 Check whether the compiler supports the new-style C++ standard
|
||||||
dnl library headers (i.e. <new>) or needs the old "new.h"
|
dnl library headers (i.e. <new>) or needs the old "new.h"
|
||||||
AC_LANG_CPLUSPLUS
|
AC_LANG_CPLUSPLUS
|
||||||
NEW_H=new.h
|
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_DEFINE_UNQUOTED(NEW_H, <$NEW_H>)
|
||||||
AC_LANG_C
|
AC_LANG_C
|
||||||
|
|
||||||
@ -3386,7 +3386,7 @@ AC_ARG_ENABLE(dtrace,
|
|||||||
[ --enable-dtrace build with dtrace support if available (default=no)],
|
[ --enable-dtrace build with dtrace support if available (default=no)],
|
||||||
[enable_dtrace="yes"],)
|
[enable_dtrace="yes"],)
|
||||||
if test "x$enable_dtrace" = "xyes"; then
|
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
|
if test -n "$HAVE_DTRACE"; then
|
||||||
AC_DEFINE(INCLUDE_MOZILLA_DTRACE)
|
AC_DEFINE(INCLUDE_MOZILLA_DTRACE)
|
||||||
else
|
else
|
||||||
@ -3399,7 +3399,7 @@ case $target in
|
|||||||
*-aix4.3*|*-aix5*)
|
*-aix4.3*|*-aix5*)
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
AC_CHECK_HEADERS(sys/cdefs.h)
|
MOZ_CHECK_HEADERS(sys/cdefs.h)
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
@ -3426,7 +3426,7 @@ case $target in
|
|||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
AC_SEARCH_LIBS(dlopen, dl,
|
AC_SEARCH_LIBS(dlopen, dl,
|
||||||
AC_CHECK_HEADER(dlfcn.h,
|
MOZ_CHECK_HEADER(dlfcn.h,
|
||||||
AC_DEFINE(HAVE_DLOPEN)))
|
AC_DEFINE(HAVE_DLOPEN)))
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
@ -3516,7 +3516,7 @@ else
|
|||||||
dnl ========================================================
|
dnl ========================================================
|
||||||
AC_CHECK_LIB(Xext, XShmCreateImage, _HAVE_XSHM_XEXT=1,,
|
AC_CHECK_LIB(Xext, XShmCreateImage, _HAVE_XSHM_XEXT=1,,
|
||||||
$XLIBS $XEXT_LIBS)
|
$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" &&
|
if test "$ac_cv_header_X11_extensions_XShm_h" = "yes" &&
|
||||||
test -n "$_HAVE_XSHM_XEXT"; then
|
test -n "$_HAVE_XSHM_XEXT"; then
|
||||||
AC_DEFINE(HAVE_XSHM)
|
AC_DEFINE(HAVE_XSHM)
|
||||||
@ -3525,7 +3525,7 @@ else
|
|||||||
dnl ========================================================
|
dnl ========================================================
|
||||||
dnl = Check for Xss
|
dnl = Check for Xss
|
||||||
dnl ========================================================
|
dnl ========================================================
|
||||||
AC_CHECK_HEADER(X11/extensions/scrnsaver.h,
|
MOZ_CHECK_HEADER(X11/extensions/scrnsaver.h,
|
||||||
AC_CHECK_LIB(Xss, XScreenSaverQueryInfo,
|
AC_CHECK_LIB(Xss, XScreenSaverQueryInfo,
|
||||||
[XSS_LIBS="-lXss $XEXT_LIBS $XLIBS"
|
[XSS_LIBS="-lXss $XEXT_LIBS $XLIBS"
|
||||||
AC_DEFINE(HAVE_LIBXSS)],, $XEXT_LIBS $XLIBS))
|
AC_DEFINE(HAVE_LIBXSS)],, $XEXT_LIBS $XLIBS))
|
||||||
@ -3535,7 +3535,7 @@ else
|
|||||||
dnl ========================================================
|
dnl ========================================================
|
||||||
AC_CHECK_LIB(XIE, XieFloGeometry, [MOZ_XIE_LIBS="-lXIE"],,
|
AC_CHECK_LIB(XIE, XieFloGeometry, [MOZ_XIE_LIBS="-lXIE"],,
|
||||||
$XLIBS $XEXT_LIBS)
|
$XLIBS $XEXT_LIBS)
|
||||||
AC_CHECK_HEADER(X11/extensions/XIElib.h)
|
MOZ_CHECK_HEADER(X11/extensions/XIElib.h)
|
||||||
|
|
||||||
if test "$MOZ_XIE_LIBS"; then
|
if test "$MOZ_XIE_LIBS"; then
|
||||||
dnl ====================================================
|
dnl ====================================================
|
||||||
@ -4466,11 +4466,11 @@ fi
|
|||||||
dnl Check for the existence of various allocation headers/functions
|
dnl Check for the existence of various allocation headers/functions
|
||||||
|
|
||||||
MALLOC_H=
|
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
|
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
|
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
|
||||||
fi
|
fi
|
||||||
if test "$MALLOC_H" != ""; then
|
if test "$MALLOC_H" != ""; then
|
||||||
@ -4682,11 +4682,11 @@ else
|
|||||||
fi
|
fi
|
||||||
CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS"
|
CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS"
|
||||||
LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS"
|
LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS"
|
||||||
AC_CHECK_HEADER(event.h,
|
MOZ_CHECK_HEADER(event.h,
|
||||||
[if test ! -f "${LIBEVENT_DIR}/include/event.h"; then
|
[if test ! -f "${LIBEVENT_DIR}/include/event.h"; then
|
||||||
AC_MSG_ERROR([event.h found, but is not in ${LIBEVENT_DIR}/include])
|
AC_MSG_ERROR([event.h found, but is not in ${LIBEVENT_DIR}/include])
|
||||||
fi],
|
fi],
|
||||||
AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
|
AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
|
||||||
AC_CHECK_LIB(event, event_init,
|
AC_CHECK_LIB(event, event_init,
|
||||||
[MOZ_NATIVE_LIBEVENT=1
|
[MOZ_NATIVE_LIBEVENT=1
|
||||||
MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
|
MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
|
||||||
@ -6043,11 +6043,11 @@ if test -n "$MOZ_WEBM"; then
|
|||||||
fi
|
fi
|
||||||
CFLAGS="-I${LIBVPX_DIR}/include $CFLAGS"
|
CFLAGS="-I${LIBVPX_DIR}/include $CFLAGS"
|
||||||
LDFLAGS="-L${LIBVPX_DIR}/lib $LDFLAGS"
|
LDFLAGS="-L${LIBVPX_DIR}/lib $LDFLAGS"
|
||||||
AC_CHECK_HEADER(vpx/vpx_decoder.h,
|
MOZ_CHECK_HEADER(vpx/vpx_decoder.h,
|
||||||
[if test ! -f "${LIBVPX_DIR}/include/vpx/vpx_decoder.h"; then
|
[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])
|
AC_MSG_ERROR([vpx/vpx_decoder.h found, but is not in ${LIBVPX_DIR}/include])
|
||||||
fi],
|
fi],
|
||||||
AC_MSG_ERROR([--with-system-libvpx requested but vpx/vpx_decoder.h not found]))
|
AC_MSG_ERROR([--with-system-libvpx requested but vpx/vpx_decoder.h not found]))
|
||||||
AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver,
|
AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver,
|
||||||
[MOZ_NATIVE_LIBVPX=1
|
[MOZ_NATIVE_LIBVPX=1
|
||||||
MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include"
|
MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include"
|
||||||
@ -6448,7 +6448,7 @@ if test -n "$MOZ_CRASHREPORTER"; then
|
|||||||
AC_SUBST(MOZ_GTHREAD_CFLAGS)
|
AC_SUBST(MOZ_GTHREAD_CFLAGS)
|
||||||
AC_SUBST(MOZ_GTHREAD_LIBS)
|
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
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -7098,8 +7098,8 @@ if test $MOZ_PLATFORM_MAEMO; then
|
|||||||
|
|
||||||
if test $MOZ_PLATFORM_MAEMO = 5; then
|
if test $MOZ_PLATFORM_MAEMO = 5; then
|
||||||
dnl if we have Xcomposite we should also have Xdamage and Xfixes
|
dnl if we have Xcomposite we should also have Xdamage and Xfixes
|
||||||
AC_CHECK_HEADERS([X11/extensions/Xdamage.h], [],
|
MOZ_CHECK_HEADERS([X11/extensions/Xdamage.h], [],
|
||||||
[AC_MSG_ERROR([Couldn't find X11/extensions/Xdamage.h which is required for composited plugins.])])
|
[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"],
|
AC_CHECK_LIB(Xcomposite, XCompositeRedirectWindow, [XCOMPOSITE_LIBS="-lXcomposite -lXdamage -lXfixes"],
|
||||||
[MISSING_X="$MISSING_X -lXcomposite"], $XLIBS)
|
[MISSING_X="$MISSING_X -lXcomposite"], $XLIBS)
|
||||||
|
|
||||||
@ -7837,7 +7837,7 @@ dnl ========================================================
|
|||||||
dnl = Support for gcc stack unwinding (from gcc 3.3)
|
dnl = Support for gcc stack unwinding (from gcc 3.3)
|
||||||
dnl ========================================================
|
dnl ========================================================
|
||||||
if test "$HAVE_GCC3_ABI" -a -z "$SKIP_LIBRARY_CHECKS"; then
|
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
|
fi
|
||||||
|
|
||||||
dnl ========================================================
|
dnl ========================================================
|
||||||
@ -8616,7 +8616,7 @@ MOZ_TREE_PIXMAN=,
|
|||||||
MOZ_TREE_PIXMAN=1 )
|
MOZ_TREE_PIXMAN=1 )
|
||||||
|
|
||||||
# Check for headers defining standard int types.
|
# 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
|
if test "$MOZ_TREE_CAIRO"; then
|
||||||
AC_DEFINE(MOZ_TREE_CAIRO)
|
AC_DEFINE(MOZ_TREE_CAIRO)
|
||||||
@ -8661,11 +8661,11 @@ if test "$MOZ_TREE_CAIRO"; then
|
|||||||
WIN32_D2D_SURFACE_FEATURE=
|
WIN32_D2D_SURFACE_FEATURE=
|
||||||
fi
|
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.
|
dnl D3D10 Layers depend on D2D Surfaces.
|
||||||
if test -n "$WIN32_D2D_SURFACE_FEATURE"; then
|
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
|
||||||
|
|
||||||
fi
|
fi
|
||||||
@ -8878,7 +8878,7 @@ fi
|
|||||||
|
|
||||||
if test -z "$SKIP_LIBRARY_CHECKS" -a "$NECKO_WIFI" -a "$OS_ARCH" = "Linux"
|
if test -z "$SKIP_LIBRARY_CHECKS" -a "$NECKO_WIFI" -a "$OS_ARCH" = "Linux"
|
||||||
then
|
then
|
||||||
AC_CHECK_HEADER([iwlib.h])
|
MOZ_CHECK_HEADER([iwlib.h])
|
||||||
if test "$ac_cv_header_iwlib_h" != "yes"; then
|
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])
|
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
|
||||||
@ -9297,7 +9297,7 @@ fi # MOZ_X11
|
|||||||
|
|
||||||
dnl Check for headers, etc. needed by WebGL.
|
dnl Check for headers, etc. needed by WebGL.
|
||||||
if test -n "$MOZ_WEBGL_GLX"; then
|
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
|
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))])
|
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
|
||||||
@ -9308,7 +9308,7 @@ if test "$USE_FC_FREETYPE"; then
|
|||||||
if test "$COMPILE_ENVIRONMENT"; then
|
if test "$COMPILE_ENVIRONMENT"; then
|
||||||
_SAVE_CPPFLAGS="$CPPFLAGS"
|
_SAVE_CPPFLAGS="$CPPFLAGS"
|
||||||
CPPFLAGS="$CPPFLAGS $FT2_CFLAGS $XCFLAGS"
|
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.)])
|
[AC_MSG_ERROR(Can't find header fontconfig/fcfreetype.h.)])
|
||||||
CPPFLAGS="$_SAVE_CPPFLAGS"
|
CPPFLAGS="$_SAVE_CPPFLAGS"
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user