Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-17 22:32:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1229541 - Turn NSPR_CFLAGS, NSS_CFLAGS, MOZ_JPEG_CFLAGS, MOZ_PNG_CFLAGS and MOZ_ZLIB_CFLAGS into AC_SUBST_LISTs. r=mshal

Browse Source
This commit is contained in:
Mike Hommey 2015-12-02 11:24:34 +09:00
parent 3209f1f0b4
commit 826f769939
6 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/autoconf/nspr-build.m4
View File

@ -165,7 +165,7 @@ elif test -z "$JS_POSIX_NSPR"; then
fi
fi
AC_SUBST(NSPR_CFLAGS)
AC_SUBST_LIST(NSPR_CFLAGS)
NSPR_PKGCONF_CHECK="nspr"
if test -n "$MOZ_NATIVE_NSPR"; then

2
build/autoconf/nspr.m4
View File

@ -104,7 +104,7 @@ AC_ARG_WITH(nspr-exec-prefix,
fi
AC_SUBST(NSPR_CFLAGS)
AC_SUBST_LIST(NSPR_CFLAGS)
AC_SUBST_LIST(NSPR_LIBS)
])

2
build/autoconf/nss.m4
View File

@ -85,7 +85,7 @@ AC_ARG_WITH(nss-exec-prefix,
fi
AC_SUBST(NSS_CFLAGS)
AC_SUBST_LIST(NSS_CFLAGS)
AC_SUBST_LIST(NSS_LIBS)
])

2
build/autoconf/zlib.m4
View File

@ -47,7 +47,7 @@ if test -z "$MOZ_ZLIB_LIBS$MOZ_ZLIB_CFLAGS$SKIP_LIBRARY_CHECKS"; then
LIBS=$_SAVE_LIBS
fi
AC_SUBST(MOZ_ZLIB_CFLAGS)
AC_SUBST_LIST(MOZ_ZLIB_CFLAGS)
AC_SUBST_LIST(MOZ_ZLIB_LIBS)
AC_SUBST(MOZ_NATIVE_ZLIB)

6
configure.in
View File

@ -8830,11 +8830,11 @@ AC_SUBST(MOZ_NATIVE_JPEG)
AC_SUBST(MOZ_NATIVE_PNG)
AC_SUBST(MOZ_NATIVE_BZ2)
AC_SUBST(MOZ_JPEG_CFLAGS)
AC_SUBST_LIST(MOZ_JPEG_CFLAGS)
AC_SUBST_LIST(MOZ_JPEG_LIBS)
AC_SUBST_LIST(MOZ_BZ2_CFLAGS)
AC_SUBST_LIST(MOZ_BZ2_LIBS)
AC_SUBST(MOZ_PNG_CFLAGS)
AC_SUBST_LIST(MOZ_PNG_CFLAGS)
AC_SUBST_LIST(MOZ_PNG_LIBS)
if test "$MOZ_WIDGET_TOOLKIT" = gonk -a -n "$MOZ_NUWA_PROCESS"; then
@ -8851,10 +8851,8 @@ if test "$MOZ_WIDGET_TOOLKIT" = gonk -a -n "$MOZ_B2G_LOADER"; then
fi
AC_SUBST(MOZ_B2G_LOADER)
AC_SUBST(NSPR_CFLAGS)
AC_SUBST(MOZ_NATIVE_NSPR)
AC_SUBST(NSS_CFLAGS)
AC_SUBST(MOZ_NATIVE_NSS)
AC_SUBST(NSS_DISABLE_DBM)

2
js/src/configure.in
View File

@ -3687,8 +3687,6 @@ HOST_CXXFLAGS=`echo \
$HOST_CXXFLAGS \
$_DEPEND_CFLAGS`
AC_SUBST(NSPR_CFLAGS)
AC_SUBST_LIST(NSPR_LIBS)
AC_SUBST(MOZ_NATIVE_NSPR)
if test -n "$MOZ_NUWA_PROCESS"; then