aboutsummaryrefslogtreecommitdiff
path: root/depends
diff options
context:
space:
mode:
authorCory Fields <cory-nospam-@coryfields.com>2014-11-05 20:00:34 -0500
committerPieter Wuille <pieter.wuille@gmail.com>2014-11-18 18:06:47 +0100
commit54566de29d988a201a6fe2ae6b2b8d54e13bd780 (patch)
tree575d307d5bd077a90fda726e9d9d9b60900813b8 /depends
parentff1e5ba8c75254ccfb08f408c607e98859d88a74 (diff)
depends: quit exporting in config.site
Diffstat (limited to 'depends')
-rw-r--r--depends/config.site.in37
1 files changed, 21 insertions, 16 deletions
diff --git a/depends/config.site.in b/depends/config.site.in
index df076956bd..873f66018d 100644
--- a/depends/config.site.in
+++ b/depends/config.site.in
@@ -48,32 +48,37 @@ if test x@host_os@ = xmingw32; then
fi
fi
-export PATH=$prefix/native/bin:$PATH
-export PKG_CONFIG="`which pkg-config` --static"
+PATH=$prefix/native/bin:$PATH
+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_PATH=$prefix/share/pkgconfig
-export CPPFLAGS="-I$prefix/include/ $CPPFLAGS"
-export LDFLAGS="-L$prefix/lib $LDFLAGS"
+CPPFLAGS="-I$prefix/include/ $CPPFLAGS"
+LDFLAGS="-L$prefix/lib $LDFLAGS"
-export CC="@CC@"
-export CXX="@CXX@"
-export OBJC="${CC}"
-export OBJCXX="${CXX}"
-export CCACHE=$prefix/native/bin/ccache
+CC="@CC@"
+CXX="@CXX@"
+OBJC="${CC}"
+OBJCXX="${CXX}"
+CCACHE=$prefix/native/bin/ccache
if test -n "@AR@"; then
- export AR=@AR@
+ AR=@AR@
ac_cv_path_ac_pt_AR=${AR}
fi
if test -n "@RANLIB@"; then
- export RANLIB=@RANLIB@
+ RANLIB=@RANLIB@
ac_cv_path_ac_pt_RANLIB=${RANLIB}
fi
if test -n "@NM@"; then
- export NM=@NM@
+ NM=@NM@
ac_cv_path_ac_pt_NM=${NM}
fi
@@ -82,14 +87,14 @@ if test -n "@debug@"; then
fi
if test -n "@CFLAGS@"; then
- export CFLAGS="@CFLAGS@ $CFLAGS"
+ CFLAGS="@CFLAGS@ $CFLAGS"
fi
if test -n "@CXXFLAGS@"; then
- export CXXFLAGS="@CXXFLAGS@ $CXXFLAGS"
+ CXXFLAGS="@CXXFLAGS@ $CXXFLAGS"
fi
if test -n "@CPPFLAGS@"; then
- export CPPFLAGS="@CPPFLAGS@ $CPPFLAGS"
+ CPPFLAGS="@CPPFLAGS@ $CPPFLAGS"
fi
if test -n "@LDFLAGS@"; then
- export LDFLAGS="@LDFLAGS@ $LDFLAGS"
+ LDFLAGS="@LDFLAGS@ $LDFLAGS"
fi