mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-03-01 05:48:26 +00:00
Oops. The 'make install' changes were from bug #56601 r=leaf
This commit is contained in:
parent
c0ec608df6
commit
d4aee86107
14
configure
vendored
14
configure
vendored
@ -1,5 +1,4 @@
|
||||
#! /bin/sh
|
||||
|
||||
# Read in '.mozconfig' script to set the initial options.
|
||||
# See the mozconfig2configure script for more details.
|
||||
_AUTOCONF_TOOLS_DIR=`dirname $0`/./build/autoconf
|
||||
@ -14353,19 +14352,6 @@ if test -z "$MOZ_NATIVE_NSPR"; then
|
||||
rm -f config/autoconf.mk.bak
|
||||
fi
|
||||
|
||||
# Hack to make sure that mozilla-config has the proper nspr dependencies
|
||||
if test -z "$MOZ_NATIVE_NSPR"; then
|
||||
FULL_NSPR_CFLAGS=`./nsprpub/config/nspr-config --cflags`
|
||||
FULL_NSPR_LIBS=`./nsprpub/config/nspr-config --libs`
|
||||
else
|
||||
FULL_NSPR_CFLAGS=`${NSPR_CONFIG} --cflags`
|
||||
FULL_NSPR_LIBS=`${NSPR_CONFIG} --libs`
|
||||
fi
|
||||
mv build/unix/mozilla-config build/unix/mozilla-config.bak
|
||||
cat build/unix/mozilla-config.bak | sed -e "s|@FULL_NSPR_LIBS@|${FULL_NSPR_LIBS}|" -e "s|@FULL_NSPR_CFLAGS@|${FULL_NSPR_CFLAGS}|" > build/unix/mozilla-config
|
||||
rm -f build/unix/mozilla-config.bak
|
||||
|
||||
|
||||
# if we're building the LDAP XPCOM component, we need to build
|
||||
# the c-sdk first.
|
||||
#
|
||||
|
Loading…
x
Reference in New Issue
Block a user