File tree Expand file tree Collapse file tree 3 files changed +3
-13
lines changed Expand file tree Collapse file tree 3 files changed +3
-13
lines changed Original file line number Diff line number Diff line change @@ -1225,14 +1225,6 @@ if test "x$have_any_system" != "xno"; then
1225
1225
AC_DEFINE ( HAVE_SYSTEM , 1 , Define to 1 if std::system or ::wsystem is available. )
1226
1226
fi
1227
1227
1228
- LEVELDB_CPPFLAGS=
1229
- LIBLEVELDB=
1230
- LIBMEMENV=
1231
- AM_CONDITIONAL([ EMBEDDED_LEVELDB] ,[ true] )
1232
- AC_SUBST ( LEVELDB_CPPFLAGS )
1233
- AC_SUBST ( LIBLEVELDB )
1234
- AC_SUBST ( LIBMEMENV )
1235
-
1236
1228
dnl SUPPRESSED_CPPFLAGS=SUPPRESS_WARNINGS([$SOME_CPPFLAGS])
1237
1229
dnl Replace -I with -isystem in $SOME_CPPFLAGS to suppress warnings from
1238
1230
dnl headers from its include directories and return the result.
Original file line number Diff line number Diff line change @@ -852,11 +852,8 @@ nodist_libbitcoin_ipc_a_SOURCES = $(libbitcoin_ipc_mpgen_output)
852
852
CLEANFILES += $(libbitcoin_ipc_mpgen_output )
853
853
endif
854
854
855
- if EMBEDDED_LEVELDB
856
855
include Makefile.crc32c.include
857
856
include Makefile.leveldb.include
858
- endif
859
-
860
857
include Makefile.test_util.include
861
858
include Makefile.test_fuzz.include
862
859
Original file line number Diff line number Diff line change @@ -8,9 +8,10 @@ LIBMEMENV_INT = leveldb/libmemenv.a
8
8
EXTRA_LIBRARIES += $(LIBLEVELDB_INT)
9
9
EXTRA_LIBRARIES += $(LIBMEMENV_INT)
10
10
11
- LIBLEVELDB + = $(LIBLEVELDB_INT) $(LIBCRC32C)
12
- LIBMEMENV + = $(LIBMEMENV_INT)
11
+ LIBLEVELDB = $(LIBLEVELDB_INT) $(LIBCRC32C)
12
+ LIBMEMENV = $(LIBMEMENV_INT)
13
13
14
+ LEVELDB_CPPFLAGS =
14
15
LEVELDB_CPPFLAGS += -I$(srcdir)/leveldb/include
15
16
LEVELDB_CPPFLAGS += -I$(srcdir)/leveldb/helpers/memenv
16
17
You can’t perform that action at this time.
0 commit comments