depends: quit exporting in config.site

This commit is contained in:
Cory Fields 2014-11-05 20:00:34 -05:00 committed by Pieter Wuille
parent ff1e5ba8c7
commit 54566de29d

View File

@ -48,32 +48,37 @@ if test x@host_os@ = xmingw32; then
fi fi
fi fi
export PATH=$prefix/native/bin:$PATH PATH=$prefix/native/bin:$PATH
export PKG_CONFIG="`which pkg-config` --static" PKG_CONFIG="`which pkg-config` --static"
# These two need to remain exported because pkg-config does not see them
# otherwise. That means they must be unexported at the end of configure.ac to
# avoid ruining the cache. Sigh.
export PKG_CONFIG_LIBDIR=$prefix/lib/pkgconfig export PKG_CONFIG_LIBDIR=$prefix/lib/pkgconfig
export PKG_CONFIG_PATH=$prefix/share/pkgconfig export PKG_CONFIG_PATH=$prefix/share/pkgconfig
export CPPFLAGS="-I$prefix/include/ $CPPFLAGS" CPPFLAGS="-I$prefix/include/ $CPPFLAGS"
export LDFLAGS="-L$prefix/lib $LDFLAGS" LDFLAGS="-L$prefix/lib $LDFLAGS"
export CC="@CC@" CC="@CC@"
export CXX="@CXX@" CXX="@CXX@"
export OBJC="${CC}" OBJC="${CC}"
export OBJCXX="${CXX}" OBJCXX="${CXX}"
export CCACHE=$prefix/native/bin/ccache CCACHE=$prefix/native/bin/ccache
if test -n "@AR@"; then if test -n "@AR@"; then
export AR=@AR@ AR=@AR@
ac_cv_path_ac_pt_AR=${AR} ac_cv_path_ac_pt_AR=${AR}
fi fi
if test -n "@RANLIB@"; then if test -n "@RANLIB@"; then
export RANLIB=@RANLIB@ RANLIB=@RANLIB@
ac_cv_path_ac_pt_RANLIB=${RANLIB} ac_cv_path_ac_pt_RANLIB=${RANLIB}
fi fi
if test -n "@NM@"; then if test -n "@NM@"; then
export NM=@NM@ NM=@NM@
ac_cv_path_ac_pt_NM=${NM} ac_cv_path_ac_pt_NM=${NM}
fi fi
@ -82,14 +87,14 @@ if test -n "@debug@"; then
fi fi
if test -n "@CFLAGS@"; then if test -n "@CFLAGS@"; then
export CFLAGS="@CFLAGS@ $CFLAGS" CFLAGS="@CFLAGS@ $CFLAGS"
fi fi
if test -n "@CXXFLAGS@"; then if test -n "@CXXFLAGS@"; then
export CXXFLAGS="@CXXFLAGS@ $CXXFLAGS" CXXFLAGS="@CXXFLAGS@ $CXXFLAGS"
fi fi
if test -n "@CPPFLAGS@"; then if test -n "@CPPFLAGS@"; then
export CPPFLAGS="@CPPFLAGS@ $CPPFLAGS" CPPFLAGS="@CPPFLAGS@ $CPPFLAGS"
fi fi
if test -n "@LDFLAGS@"; then if test -n "@LDFLAGS@"; then
export LDFLAGS="@LDFLAGS@ $LDFLAGS" LDFLAGS="@LDFLAGS@ $LDFLAGS"
fi fi