Bug 377344 - Configure should check for PR_STATIC_ASSERT support when building with system NSPR. Patch by Mook <mook.moz+mozbz@gmail.com>, r=benjamin.
This commit is contained in:
Родитель
743cdef5c8
Коммит
9f9c705be4
12
configure.in
12
configure.in
|
@ -3832,7 +3832,17 @@ if test -n "$_USE_SYSTEM_NSPR"; then
|
|||
AM_PATH_NSPR(4.0.0, [MOZ_NATIVE_NSPR=1], [MOZ_NATIVE_NSPR=])
|
||||
fi
|
||||
|
||||
if test -z "$MOZ_NATIVE_NSPR"; then
|
||||
if test -n "$MOZ_NATIVE_NSPR"; then
|
||||
_SAVE_CFLAGS=$CFLAGS
|
||||
CFLAGS="$CFLAGS $NSPR_CFLAGS"
|
||||
AC_TRY_COMPILE([#include "prlog.h"],
|
||||
[#ifndef PR_STATIC_ASSERT
|
||||
#error PR_STATIC_ASSERT not defined
|
||||
#endif],
|
||||
[MOZ_NATIVE_NSPR=1],
|
||||
AC_MSG_ERROR([system NSPR does not support PR_STATIC_ASSERT]))
|
||||
CFLAGS=$_SAVE_CFLAGS
|
||||
else
|
||||
NSPR_CFLAGS='`$(DEPTH)/nsprpub/config/nspr-config --prefix=$(LIBXUL_DIST) --includedir=$(LIBXUL_DIST)/include/nspr --cflags`'
|
||||
# explicitly set libs for Visual Age C++ for OS/2
|
||||
if test "$OS_ARCH" = "OS2" -a "$VACPP" = "yes"; then
|
||||
|
|
Загрузка…
Ссылка в новой задаче