mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 983945: Handle an NSPR configure script generated with autoconf 2.68.
r=glandium. Bug 849085: Port NSPR's build/autoconf/acwinpaths.m4 to autoconf 2.56+. r=bsmedberg.
This commit is contained in:
parent
8b07ffe912
commit
e7b32897b3
19
configure.in
19
configure.in
@ -9137,6 +9137,20 @@ if test -z "$MOZ_NATIVE_NSPR"; then
|
|||||||
if test -n "$USE_ARM_KUSER"; then
|
if test -n "$USE_ARM_KUSER"; then
|
||||||
ac_configure_args="$ac_configure_args --with-arm-kuser"
|
ac_configure_args="$ac_configure_args --with-arm-kuser"
|
||||||
fi
|
fi
|
||||||
|
# A configure script generated by autoconf 2.68 does not allow the cached
|
||||||
|
# values of "precious" variables such as CFLAGS and LDFLAGS to differ from
|
||||||
|
# the values passed to the configure script. Since we modify CFLAGS and
|
||||||
|
# LDFLAGS before passing them to NSPR's configure script, we cannot share
|
||||||
|
# config.cache with NSPR. As a result, we cannot pass AS, CC, CXX, etc. to
|
||||||
|
# NSPR via a shared config.cache file and must pass them to NSPR on the
|
||||||
|
# configure command line.
|
||||||
|
for var in AS CC CXX CPP LD AR RANLIB STRIP; do
|
||||||
|
ac_configure_args="$ac_configure_args $var='`eval echo \\${${var}}`'"
|
||||||
|
done
|
||||||
|
# A configure script generated by autoconf 2.68 warns if --host is
|
||||||
|
# specified but --build isn't. So we always pass --build to NSPR's
|
||||||
|
# configure script.
|
||||||
|
ac_configure_args="$ac_configure_args --build=$build"
|
||||||
ac_configure_args="$ac_configure_args $NSPR_CONFIGURE_ARGS"
|
ac_configure_args="$ac_configure_args $NSPR_CONFIGURE_ARGS"
|
||||||
|
|
||||||
# Save these, so we can mess with them for the subconfigure ..
|
# Save these, so we can mess with them for the subconfigure ..
|
||||||
@ -9152,9 +9166,14 @@ if test -z "$MOZ_NATIVE_NSPR"; then
|
|||||||
export LDFLAGS="$LDFLAGS $NSPR_LDFLAGS"
|
export LDFLAGS="$LDFLAGS $NSPR_LDFLAGS"
|
||||||
export CFLAGS="$CFLAGS $MOZ_FRAMEPTR_FLAGS"
|
export CFLAGS="$CFLAGS $MOZ_FRAMEPTR_FLAGS"
|
||||||
|
|
||||||
|
# Use a separate cache file for NSPR since it uses autoconf 2.68.
|
||||||
|
_save_cache_file="$cache_file"
|
||||||
|
cache_file=$_objdir/nsprpub/config.cache
|
||||||
|
|
||||||
AC_OUTPUT_SUBDIRS(nsprpub)
|
AC_OUTPUT_SUBDIRS(nsprpub)
|
||||||
|
|
||||||
# .. and restore them
|
# .. and restore them
|
||||||
|
cache_file="$_save_cache_file"
|
||||||
CFLAGS="$_SAVE_CFLAGS"
|
CFLAGS="$_SAVE_CFLAGS"
|
||||||
CPPFLAGS="$_SAVE_CPPFLAGS"
|
CPPFLAGS="$_SAVE_CPPFLAGS"
|
||||||
LDFLAGS="$_SAVE_LDFLAGS"
|
LDFLAGS="$_SAVE_LDFLAGS"
|
||||||
|
@ -1 +1 @@
|
|||||||
NSPR_4_10_5_BETA1
|
NSPR_4_10_5_BETA2
|
||||||
|
@ -2,30 +2,12 @@ dnl This Source Code Form is subject to the terms of the Mozilla Public
|
|||||||
dnl License, v. 2.0. If a copy of the MPL was not distributed with this
|
dnl License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
define(GENERATE_SUB_ABS, [
|
dnl Work around the problem that a DOS-style absolute path is split by
|
||||||
define([AC_OUTPUT_FILES_SUB1], [
|
dnl the colon in autoconf 2.59 and earlier. The _AC_OUTPUT_FILES macro
|
||||||
patsubst($@, [/\*)], [/* | ?:/*)])
|
dnl was removed and the problem was fixed in autoconf 2.60.
|
||||||
|
define(GENERATE_FILES_NOSPLIT, [
|
||||||
|
define([_AC_OUTPUT_FILES],
|
||||||
|
[patsubst($@, [`IFS=:], [`#IFS=:])])
|
||||||
])
|
])
|
||||||
])
|
m4_ifdef([_AC_OUTPUT_FILES],
|
||||||
GENERATE_SUB_ABS(defn([AC_OUTPUT_FILES]))
|
[GENERATE_FILES_NOSPLIT(defn([_AC_OUTPUT_FILES]))])
|
||||||
|
|
||||||
define(GENERATE_SUB_NOSPLIT, [
|
|
||||||
define([AC_OUTPUT_FILES], [
|
|
||||||
patsubst($@, [-e "s%:% \$ac_given_srcdir/%g"], [])
|
|
||||||
])
|
|
||||||
])
|
|
||||||
GENERATE_SUB_NOSPLIT(defn([AC_OUTPUT_FILES_SUB1]))
|
|
||||||
|
|
||||||
define(GENERATE_HEADER_NOSPLIT, [
|
|
||||||
define([AC_OUTPUT_HEADER], [
|
|
||||||
patsubst($@, [-e "s%:% \$ac_given_srcdir/%g"], [])
|
|
||||||
])
|
|
||||||
])
|
|
||||||
GENERATE_HEADER_NOSPLIT(defn([AC_OUTPUT_HEADER]))
|
|
||||||
|
|
||||||
define(GENERATE_SUBDIRS_ABS, [
|
|
||||||
define([AC_OUTPUT_SUBDIRS], [
|
|
||||||
patsubst($@, [/\*)], [/* | ?:/*)])
|
|
||||||
])
|
|
||||||
])
|
|
||||||
GENERATE_SUBDIRS_ABS(defn([AC_OUTPUT_SUBDIRS]))
|
|
||||||
|
@ -14,6 +14,7 @@ exec_prefix = @exec_prefix@
|
|||||||
bindir = @bindir@
|
bindir = @bindir@
|
||||||
includedir = @includedir@
|
includedir = @includedir@
|
||||||
libdir = @libdir@
|
libdir = @libdir@
|
||||||
|
datarootdir = @datarootdir@
|
||||||
datadir = @datadir@
|
datadir = @datadir@
|
||||||
|
|
||||||
dist_prefix = @dist_prefix@
|
dist_prefix = @dist_prefix@
|
||||||
|
@ -10,4 +10,3 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#error "Do not include this header file."
|
#error "Do not include this header file."
|
||||||
|
|
||||||
|
9086
nsprpub/configure
vendored
9086
nsprpub/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -4,7 +4,7 @@ dnl This Source Code Form is subject to the terms of the Mozilla Public
|
|||||||
dnl License, v. 2.0. If a copy of the MPL was not distributed with this
|
dnl License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
AC_PREREQ(2.12)
|
AC_PREREQ(2.56)
|
||||||
AC_INIT(config/libc_r.h)
|
AC_INIT(config/libc_r.h)
|
||||||
|
|
||||||
AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
|
AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
|
||||||
|
Loading…
Reference in New Issue
Block a user