diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2014-11-05 20:01:42 -0500 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-11-18 18:06:47 +0100 |
| commit | 0dc8613864052172447d32338f4492669918cefa (patch) | |
| tree | e598378fc1e6f5c92d74080c4282d2d055be78f1 /configure.ac | |
| parent | 54566de29d988a201a6fe2ae6b2b8d54e13bd780 (diff) | |
| download | bitcoin-0dc8613864052172447d32338f4492669918cefa.tar.xz | |
build: fixup configure to not export anything
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 6fdcc22b47..4904dd72ca 100644 --- a/configure.ac +++ b/configure.ac @@ -255,7 +255,6 @@ case $host in qt5_prefix=`$BREW --prefix qt5 2>/dev/null` if test x$openssl_prefix != x; then PKG_CONFIG_PATH="$openssl_prefix/lib/pkgconfig:$PKG_CONFIG_PATH" - export PKG_CONFIG_PATH fi if test x$bdb_prefix != x; then CPPFLAGS="$CPPFLAGS -I$bdb_prefix/include" @@ -263,7 +262,6 @@ case $host in fi if test x$qt5_prefix != x; then PKG_CONFIG_PATH="$qt5_prefix/lib/pkgconfig:$PKG_CONFIG_PATH" - export PKG_CONFIG_PATH fi fi else @@ -819,8 +817,26 @@ AC_CONFIG_FILES([qa/pull-tester/tests-config.sh],[chmod +x qa/pull-tester/tests- dnl boost's m4 checks do something really nasty: they export these vars. As a dnl result, they leak into secp256k1's configure and crazy things happen. dnl Until this is fixed upstream and we've synced, we'll just un-export them. +CPPFLAGS_TEMP="$CPPFLAGS" unset CPPFLAGS +CPPFLAGS="$CPPFLAGS_TEMP" + +LDFLAGS_TEMP="$LDFLAGS" unset LDFLAGS +LDFLAGS="$LDFLAGS_TEMP" + +LIBS_TEMP="$LIBS" +unset LIBS +LIBS="$LIBS_TEMP" + +PKGCONFIG_PATH_TEMP="$PKG_CONFIG_PATH" +unset PKG_CONFIG_PATH +PKG_CONFIG_PATH="$PKGCONFIG_PATH_TEMP" + +PKGCONFIG_LIBDIR_TEMP="$PKG_CONFIG_LIBDIR" +unset PKG_CONFIG_LIBDIR +PKG_CONFIG_LIBDIR="$PKGCONFIG_LIBDIR_TEMP" + ac_configure_args="${ac_configure_args} --disable-shared --with-pic" AC_CONFIG_SUBDIRS([src/secp256k1]) |