]>
Commit | Line | Data |
---|---|---|
21ecc387 | 1 | *** configure.ac 2017-01-03 10:53:52.436371005 +0000 |
2 | --- ../../komodo-jl777/configure.ac 2017-01-03 09:49:08.848505929 +0000 | |
3 | *************** | |
4 | *** 124,130 **** | |
5 | [AS_HELP_STRING([--enable-hardening], | |
6 | [attempt to harden the resulting executables (default is yes)])], | |
7 | [use_hardening=$enableval], | |
8 | ! [use_hardening=no]) | |
9 | ||
10 | AC_ARG_ENABLE([reduce-exports], | |
11 | [AS_HELP_STRING([--enable-reduce-exports], | |
12 | --- 124,130 ---- | |
13 | [AS_HELP_STRING([--enable-hardening], | |
14 | [attempt to harden the resulting executables (default is yes)])], | |
15 | [use_hardening=$enableval], | |
16 | ! [use_hardening=yes]) | |
17 | ||
18 | AC_ARG_ENABLE([reduce-exports], | |
19 | [AS_HELP_STRING([--enable-reduce-exports], | |
20 | *************** | |
21 | *** 276,305 **** | |
22 | fi | |
23 | fi | |
24 | ||
25 | ! dnl AC_CHECK_PROG([BREW],brew, brew) | |
26 | ! dnl if test x$BREW = xbrew; then | |
27 | dnl These Homebrew packages may be keg-only, meaning that they won't be found | |
28 | dnl in expected paths because they may conflict with system files. Ask | |
29 | dnl Homebrew where each one is located, then adjust paths accordingly. | |
30 | dnl It's safe to add these paths even if the functionality is disabled by | |
31 | dnl the user (--without-wallet or --without-gui for example). | |
32 | ||
33 | ! dnl openssl_prefix=`$BREW --prefix openssl 2>/dev/null` | |
34 | ! dnl bdb_prefix=`$BREW --prefix berkeley-db4 2>/dev/null` | |
35 | ! dnl qt5_prefix=`$BREW --prefix qt5 2>/dev/null` | |
36 | ! dnl if test x$openssl_prefix != x; then | |
37 | ! dnl PKG_CONFIG_PATH="$PKG_CONFIG_PATH" | |
38 | ! dnl export PKG_CONFIG_PATH | |
39 | ! dnl fi | |
40 | ! dnl if test x$bdb_prefix != x; then | |
41 | ! dnl CPPFLAGS="$CPPFLAGS -I$bdb_prefix/include" | |
42 | ! dnl LIBS="$LIBS -L$bdb_prefix/lib" | |
43 | ! dnl fi | |
44 | ! dnl if test x$qt5_prefix != x; then | |
45 | ! dnl PKG_CONFIG_PATH="$qt5_prefix/lib/pkgconfig:$PKG_CONFIG_PATH" | |
46 | ! dnl export PKG_CONFIG_PATH | |
47 | ! dnl fi | |
48 | ! dnl fi | |
49 | else | |
50 | case $build_os in | |
51 | *darwin*) | |
52 | --- 276,305 ---- | |
53 | fi | |
54 | fi | |
55 | ||
56 | ! AC_CHECK_PROG([BREW],brew, brew) | |
57 | ! if test x$BREW = xbrew; then | |
58 | dnl These Homebrew packages may be keg-only, meaning that they won't be found | |
59 | dnl in expected paths because they may conflict with system files. Ask | |
60 | dnl Homebrew where each one is located, then adjust paths accordingly. | |
61 | dnl It's safe to add these paths even if the functionality is disabled by | |
62 | dnl the user (--without-wallet or --without-gui for example). | |
63 | ||
64 | ! openssl_prefix=`$BREW --prefix openssl 2>/dev/null` | |
65 | ! bdb_prefix=`$BREW --prefix berkeley-db4 2>/dev/null` | |
66 | ! qt5_prefix=`$BREW --prefix qt5 2>/dev/null` | |
67 | ! if test x$openssl_prefix != x; then | |
68 | ! PKG_CONFIG_PATH="$openssl_prefix/lib/pkgconfig:$PKG_CONFIG_PATH" | |
69 | ! export PKG_CONFIG_PATH | |
70 | ! fi | |
71 | ! if test x$bdb_prefix != x; then | |
72 | ! CPPFLAGS="$CPPFLAGS -I$bdb_prefix/include" | |
73 | ! LIBS="$LIBS -L$bdb_prefix/lib" | |
74 | ! fi | |
75 | ! if test x$qt5_prefix != x; then | |
76 | ! PKG_CONFIG_PATH="$qt5_prefix/lib/pkgconfig:$PKG_CONFIG_PATH" | |
77 | ! export PKG_CONFIG_PATH | |
78 | ! fi | |
79 | ! fi | |
80 | else | |
81 | case $build_os in | |
82 | *darwin*) | |
83 | *************** | |
84 | *** 730,736 **** | |
85 | AC_CHECK_HEADER([libsnark/gadgetlib1/gadget.hpp],,AC_MSG_ERROR(libsnark headers missing)) | |
86 | AC_CHECK_LIB([snark],[main],LIBSNARK_LIBS=-lsnark, [AC_MSG_ERROR(libsnark missing)], [-lgmpxx]) | |
87 | ||
88 | ! LIBZCASH_LIBS="-lsnark -lgmp -lgmpxx -lboost_system-mt -lcrypto -lsodium" | |
89 | ||
90 | CXXFLAGS_TEMP="$CXXFLAGS" | |
91 | LIBS_TEMP="$LIBS" | |
92 | --- 730,736 ---- | |
93 | AC_CHECK_HEADER([libsnark/gadgetlib1/gadget.hpp],,AC_MSG_ERROR(libsnark headers missing)) | |
94 | AC_CHECK_LIB([snark],[main],LIBSNARK_LIBS=-lsnark, [AC_MSG_ERROR(libsnark missing)], [-lgmpxx]) | |
95 | ||
96 | ! LIBZCASH_LIBS="-lsnark -lgmp -lgmpxx -lboost_system-mt -lcrypto -lsodium -fopenmp" | |
97 | ||
98 | CXXFLAGS_TEMP="$CXXFLAGS" | |
99 | LIBS_TEMP="$LIBS" |