Skip to content

Commit 21cd457

Browse files
pmienkpmienk
authored
Merge pull request #472 from pmienk/version3
Regenerate artifacts.
2 parents 8054c9f + 9a80106 commit 21cd457

File tree

3 files changed

+126
-36
lines changed

3 files changed

+126
-36
lines changed

‎.travis.yml‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ matrix:
5050
addons:
5151
apt:
5252
packages:
53-
- lcov
5453
- bash-completion
5554
fast_finish:
5655
- true
@@ -84,22 +83,27 @@ install:
8483
script:
8584

8685
# Download and build libbitcoin-server and all dependencies.
87-
- if [[ $OSX && $CLANG && $STATIC ]]; then CC=$CC CXX=$CXX ./install.sh --without-consensus --disable-shared --build-boost --build-zmq --prefix=$TRAVIS_BUILD_DIR/my-prefix; fi
88-
- if [[ $LINUX && $CLANG && $STATIC ]]; then CC=$CC CXX=$CXX ./install.sh --disable-shared --build-boost --build-zmq --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Os' CXXFLAGS='-Os'; fi
89-
- if [[ $LINUX && $GCC && $STATIC ]]; then CC=$CC CXX=$CXX ./install.sh --build-boost --build-zmq --disable-shared --build-dir=my-build --prefix=$TRAVIS_BUILD_DIR/my-prefix --with-bash-completiondir=$TRAVIS_BUILD_DIR/my-prefix/share/bash-completion/completions CFLAGS='-Og -g --coverage' CXXFLAGS='-Og -g --coverage'; fi
90-
- if [[ $OSX && $CLANG && $DYNAMIC ]]; then CC=$CC CXX=$CXX ./install.sh --build-zmq --disable-static --with-bash-completiondir; fi
91-
- if [[ $LINUX && $CLANG && $DYNAMIC ]]; then CC=$CC CXX=$CXX ./install.sh --build-boost --build-zmq --disable-ndebug --disable-static --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Os' CXXFLAGS='-Os'; fi
92-
- if [[ $LINUX && $GCC && $DYNAMIC ]]; then CC=$CC CXX=$CXX ./install.sh --without-consensus --disable-static --build-boost --build-zmq --with-bash-completiondir=$TRAVIS_BUILD_DIR/my-prefix/share/bash-completion/completions --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Os -s' CXXFLAGS='-Os -s'; fi
86+
- if [[ $OSX && $CLANG && $STATIC ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --without-consensus --disable-shared --build-boost --build-zmq --prefix=$TRAVIS_BUILD_DIR/my-prefix; fi
87+
- if [[ $LINUX && $CLANG && $STATIC ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --disable-shared --build-boost --build-zmq --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Os' CXXFLAGS='-Os'; fi
88+
- if [[ $LINUX && $GCC && $STATIC ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --build-boost --build-zmq --disable-shared --build-dir=my-build --prefix=$TRAVIS_BUILD_DIR/my-prefix --with-bash-completiondir=$TRAVIS_BUILD_DIR/my-prefix/share/bash-completion/completions CFLAGS='-Og -g --coverage' CXXFLAGS='-Og -g --coverage'; fi
89+
- if [[ $OSX && $CLANG && $DYNAMIC ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --build-zmq --disable-static --with-bash-completiondir; fi
90+
- if [[ $LINUX && $CLANG && $DYNAMIC ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --build-boost --build-zmq --disable-ndebug --disable-static --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Os' CXXFLAGS='-Os'; fi
91+
- if [[ $LINUX && $GCC && $DYNAMIC ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --without-consensus --disable-static --build-boost --build-zmq --with-bash-completiondir=$TRAVIS_BUILD_DIR/my-prefix/share/bash-completion/completions --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Os -s' CXXFLAGS='-Os -s'; fi
9392

9493
after_success:
9594

96-
# Install coveralls and current lcov.
95+
# Download and unpack lcov > 1.10
96+
- if [[ $LINUX && $GCC && $STATIC ]]; then wget https://github.com/linux-test-project/lcov/releases/download/v1.12/lcov-1.12.tar.gz; fi
97+
- if [[ $LINUX && $GCC && $STATIC ]]; then tar xzf lcov-1.12.tar.gz; fi
98+
- if [[ $LINUX && $GCC && $STATIC ]]; then cd lcov-1.12; PREFIX="$TRAVIS_BUILD_DIR/my-prefix" make install; cd ..; fi
99+
100+
# Install coveralls.
97101
- if [[ $LINUX && $GCC && $STATIC ]]; then gem install coveralls-lcov; fi
98102

99103
# Capture coverage info, filter out system and test code, and debug before upload.
100-
- if [[ $LINUX && $GCC && $STATIC ]]; then lcov --directory . --capture --output-file coverage.info; fi
101-
- if [[ $LINUX && $GCC && $STATIC ]]; then lcov --remove coverage.info "/usr/*" "$TRAVIS_BUILD_DIR/my-prefix/*" "my-build/*" "test/*" --output-file coverage.info; fi
102-
- if [[ $LINUX && $GCC && $STATIC ]]; then lcov --list coverage.info; fi
104+
- if [[ $LINUX && $GCC && $STATIC ]]; then $TRAVIS_BUILD_DIR/my-prefix/usr/bin/lcov --directory . --capture --output-file coverage.info; fi
105+
- if [[ $LINUX && $GCC && $STATIC ]]; then $TRAVIS_BUILD_DIR/my-prefix/usr/bin/lcov --remove coverage.info "/usr/*" "$TRAVIS_BUILD_DIR/my-prefix/*" "my-build/*" "test/*" --output-file coverage.info; fi
106+
- if [[ $LINUX && $GCC && $STATIC ]]; then $TRAVIS_BUILD_DIR/my-prefix/usr/bin/lcov --list coverage.info; fi
103107

104108
# Upload coverage info to coveralls service (--repo-token <private coveralls repo token>).
105109
- if [[ $LINUX && $GCC && $STATIC ]]; then coveralls-lcov coverage.info; fi

‎Makefile.am‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ doc_DATA = \
3232
# src/libbitcoin-server.la => ${libdir}
3333
#------------------------------------------------------------------------------
3434
lib_LTLIBRARIES = src/libbitcoin-server.la
35-
src_libbitcoin_server_la_CPPFLAGS = -I${srcdir}/include -DSYSCONFDIR=\"${sysconfdir}\" ${bitcoin_protocol_CPPFLAGS} ${bitcoin_node_CPPFLAGS}
35+
src_libbitcoin_server_la_CPPFLAGS = -I${srcdir}/include -DSYSCONFDIR=\"${sysconfdir}\" ${bitcoin_protocol_BUILD_CPPFLAGS} ${bitcoin_node_BUILD_CPPFLAGS}
3636
src_libbitcoin_server_la_LIBADD = ${bitcoin_protocol_LIBS} ${bitcoin_node_LIBS}
3737
src_libbitcoin_server_la_SOURCES = \
3838
src/configuration.cpp \
@@ -61,7 +61,7 @@ if WITH_TESTS
6161
TESTS = libbitcoin-server-test_runner.sh
6262

6363
check_PROGRAMS = test/libbitcoin-server-test
64-
test_libbitcoin_server_test_CPPFLAGS = -I${srcdir}/include ${bitcoin_protocol_CPPFLAGS} ${bitcoin_node_CPPFLAGS}
64+
test_libbitcoin_server_test_CPPFLAGS = -I${srcdir}/include ${bitcoin_protocol_BUILD_CPPFLAGS} ${bitcoin_node_BUILD_CPPFLAGS}
6565
test_libbitcoin_server_test_LDADD = src/libbitcoin-server.la ${boost_unit_test_framework_LIBS} ${bitcoin_protocol_LIBS} ${bitcoin_node_LIBS}
6666
test_libbitcoin_server_test_SOURCES = \
6767
test/main.cpp \
@@ -75,7 +75,7 @@ endif WITH_TESTS
7575
if WITH_CONSOLE
7676

7777
bin_PROGRAMS = console/bs
78-
console_bs_CPPFLAGS = -I${srcdir}/include ${bitcoin_protocol_CPPFLAGS} ${bitcoin_node_CPPFLAGS}
78+
console_bs_CPPFLAGS = -I${srcdir}/include ${bitcoin_protocol_BUILD_CPPFLAGS} ${bitcoin_node_BUILD_CPPFLAGS}
7979
console_bs_LDADD = src/libbitcoin-server.la ${bitcoin_protocol_LIBS} ${bitcoin_node_LIBS}
8080
console_bs_SOURCES = \
8181
console/executor.cpp \

‎configure.ac‎

Lines changed: 108 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ AC_PROG_CXX
4444
# Enable shared libraries if available, and static if they don't conflict.
4545
AC_PROG_LIBTOOL
4646

47+
# Enable sed for substitution.
48+
AC_PROG_SED
49+
4750
# Compute the canonical host-system type variable host, including host_os.
4851
AC_CANONICAL_HOST
4952

@@ -52,6 +55,9 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
5255

5356
# Check for pkg-config.
5457
PKG_PROG_PKG_CONFIG
58+
AS_IF([test -n "$PKG_CONFIG"], [],
59+
[AC_MSG_ERROR([pkg-config is required but was not found.])])
60+
5561

5662
# Declare environment variables that affect the build.
5763
#------------------------------------------------------------------------------
@@ -126,6 +132,16 @@ AS_CASE([${enable_ndebug}], [yes], AC_DEFINE([NDEBUG]))
126132
#------------------------------------------------------------------------------
127133
AS_CASE([${enable_shared}], [yes], AC_DEFINE([BOOST_ALL_DYN_LINK]))
128134

135+
# Implement --enable-isystem.
136+
#------------------------------------------------------------------------------
137+
AC_MSG_CHECKING([--enable-isystem option])
138+
AC_ARG_ENABLE([isystem],
139+
AS_HELP_STRING([--enable-isystem],
140+
[Substitute -isystem for -I in dependencies. @<:@default=no@:>@]),
141+
[enable_isystem=$enableval],
142+
[enable_isystem=no])
143+
AC_MSG_RESULT([$enable_isystem])
144+
129145

130146
# Check dependencies.
131147
#==============================================================================
@@ -134,11 +150,19 @@ AS_CASE([${enable_shared}], [yes], AC_DEFINE([BOOST_ALL_DYN_LINK]))
134150
AS_CASE([${CC}], [*],
135151
[AX_BOOST_BASE([1.57.0],
136152
[AC_SUBST([boost_CPPFLAGS], [${BOOST_CPPFLAGS}])
153+
AC_SUBST([boost_ISYS_CPPFLAGS], [`echo ${BOOST_CPPFLAGS} | $SED s/^-I/-isystem/g | $SED s/' -I'/' -isystem'/g`])
137154
AC_SUBST([boost_LDFLAGS], [${BOOST_LDFLAGS}])
138155
AC_MSG_NOTICE([boost_CPPFLAGS : ${boost_CPPFLAGS}])
156+
AC_MSG_NOTICE([boost_ISYS_CPPFLAGS : ${boost_ISYS_CPPFLAGS}])
139157
AC_MSG_NOTICE([boost_LDFLAGS : ${boost_LDFLAGS}])],
140158
[AC_MSG_ERROR([Boost 1.57.0 or later is required but was not found.])])])
141159

160+
AS_CASE([${enable_isystem}],[yes],
161+
[AC_SUBST([boost_BUILD_CPPFLAGS], [${boost_ISYS_CPPFLAGS}])],
162+
[AC_SUBST([boost_BUILD_CPPFLAGS], [${boost_CPPFLAGS}])])
163+
164+
AC_MSG_NOTICE([boost_BUILD_CPPFLAGS : ${boost_BUILD_CPPFLAGS}])
165+
142166
AS_CASE([${with_tests}], [yes],
143167
[AX_BOOST_UNIT_TEST_FRAMEWORK
144168
AC_SUBST([boost_unit_test_framework_LIBS], [${BOOST_UNIT_TEST_FRAMEWORK_LIB}])
@@ -149,30 +173,78 @@ AS_CASE([${with_tests}], [yes],
149173
#------------------------------------------------------------------------------
150174
AS_CASE([${bash_completiondir}], [yes],
151175
[PKG_CHECK_MODULES([bash_completion], [bash-completion >= 2.0.0],
152-
[bash_completiondir="`pkg-config --variable=completionsdir bash-completion`"],
153-
[bash_completiondir="${datadir}/bash-completion/completions"])
176+
[bash_completion_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "bash-completion >= 2.0.0" 2>/dev/null`"
177+
bash_completion_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "bash-completion >= 2.0.0" 2>/dev/null`"
178+
bash_completiondir="`$PKG_CONFIG --variable=completionsdir "bash-completion >= 2.0.0" 2>/dev/null`"],
179+
[bash_completion_INCLUDEDIR=""
180+
bash_completion_OTHER_CFLAGS=""
181+
bash_completiondir="${datadir}/bash-completion/completions"])
154182
AC_SUBST([bash_completion_PKG], ['bash-completion >= 2.0.0'])
155183
AC_SUBST([bash_completion_CPPFLAGS], [${bash_completion_CFLAGS}])
184+
AS_IF([test x${bash_completion_INCLUDEDIR} != "x"],
185+
[AC_SUBST([bash_completion_ISYS_CPPFLAGS], ["-isystem${bash_completion_INCLUDEDIR} ${bash_completion_OTHER_CFLAGS}"])],
186+
[AC_SUBST([bash_completion_ISYS_CPPFLAGS], [${bash_completion_OTHER_CFLAGS}])])
156187
AC_MSG_NOTICE([bash_completion_CPPFLAGS : ${bash_completion_CPPFLAGS}])
188+
AC_MSG_NOTICE([bash_completion_ISYS_CPPFLAGS : ${bash_completion_ISYS_CPPFLAGS}])
189+
AC_MSG_NOTICE([bash_completion_OTHER_CFLAGS : ${bash_completion_OTHER_CFLAGS}])
190+
AC_MSG_NOTICE([bash_completion_INCLUDEDIR : ${bash_completion_INCLUDEDIR}])
157191
AC_MSG_NOTICE([bash_completion_LIBS : ${bash_completion_LIBS}])],
158192
[AC_SUBST([bash_completion_PKG], [])])
159193

194+
AS_CASE([${enable_isystem}],[yes],
195+
[AC_SUBST([bash_completion_BUILD_CPPFLAGS], [${bash_completion_ISYS_CPPFLAGS}])],
196+
[AC_SUBST([bash_completion_BUILD_CPPFLAGS], [${bash_completion_CPPFLAGS}])])
197+
198+
AC_MSG_NOTICE([bash_completion_BUILD_CPPFLAGS : ${bash_completion_BUILD_CPPFLAGS}])
199+
160200
# Require bitcoin-node of at least version 3.4.0 and output ${bitcoin_node_CPPFLAGS/LIBS/PKG}.
161201
#------------------------------------------------------------------------------
162-
PKG_CHECK_MODULES([bitcoin_node], [libbitcoin-node >= 3.4.0])
202+
PKG_CHECK_MODULES([bitcoin_node], [libbitcoin-node >= 3.4.0],
203+
[bitcoin_node_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-node >= 3.4.0" 2>/dev/null`"
204+
bitcoin_node_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-node >= 3.4.0" 2>/dev/null`"],
205+
[bitcoin_node_INCLUDEDIR=""
206+
bitcoin_node_OTHER_CFLAGS=""])
163207
AC_SUBST([bitcoin_node_PKG], ['libbitcoin-node >= 3.4.0'])
164208
AC_SUBST([bitcoin_node_CPPFLAGS], [${bitcoin_node_CFLAGS}])
209+
AS_IF([test x${bitcoin_node_INCLUDEDIR} != "x"],
210+
[AC_SUBST([bitcoin_node_ISYS_CPPFLAGS], ["-isystem${bitcoin_node_INCLUDEDIR} ${bitcoin_node_OTHER_CFLAGS}"])],
211+
[AC_SUBST([bitcoin_node_ISYS_CPPFLAGS], [${bitcoin_node_OTHER_CFLAGS}])])
165212
AC_MSG_NOTICE([bitcoin_node_CPPFLAGS : ${bitcoin_node_CPPFLAGS}])
213+
AC_MSG_NOTICE([bitcoin_node_ISYS_CPPFLAGS : ${bitcoin_node_ISYS_CPPFLAGS}])
214+
AC_MSG_NOTICE([bitcoin_node_OTHER_CFLAGS : ${bitcoin_node_OTHER_CFLAGS}])
215+
AC_MSG_NOTICE([bitcoin_node_INCLUDEDIR : ${bitcoin_node_INCLUDEDIR}])
166216
AC_MSG_NOTICE([bitcoin_node_LIBS : ${bitcoin_node_LIBS}])
167217

218+
AS_CASE([${enable_isystem}],[yes],
219+
[AC_SUBST([bitcoin_node_BUILD_CPPFLAGS], [${bitcoin_node_ISYS_CPPFLAGS}])],
220+
[AC_SUBST([bitcoin_node_BUILD_CPPFLAGS], [${bitcoin_node_CPPFLAGS}])])
221+
222+
AC_MSG_NOTICE([bitcoin_node_BUILD_CPPFLAGS : ${bitcoin_node_BUILD_CPPFLAGS}])
223+
168224
# Require bitcoin-protocol of at least version 3.4.0 and output ${bitcoin_protocol_CPPFLAGS/LIBS/PKG}.
169225
#------------------------------------------------------------------------------
170-
PKG_CHECK_MODULES([bitcoin_protocol], [libbitcoin-protocol >= 3.4.0])
226+
PKG_CHECK_MODULES([bitcoin_protocol], [libbitcoin-protocol >= 3.4.0],
227+
[bitcoin_protocol_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-protocol >= 3.4.0" 2>/dev/null`"
228+
bitcoin_protocol_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-protocol >= 3.4.0" 2>/dev/null`"],
229+
[bitcoin_protocol_INCLUDEDIR=""
230+
bitcoin_protocol_OTHER_CFLAGS=""])
171231
AC_SUBST([bitcoin_protocol_PKG], ['libbitcoin-protocol >= 3.4.0'])
172232
AC_SUBST([bitcoin_protocol_CPPFLAGS], [${bitcoin_protocol_CFLAGS}])
233+
AS_IF([test x${bitcoin_protocol_INCLUDEDIR} != "x"],
234+
[AC_SUBST([bitcoin_protocol_ISYS_CPPFLAGS], ["-isystem${bitcoin_protocol_INCLUDEDIR} ${bitcoin_protocol_OTHER_CFLAGS}"])],
235+
[AC_SUBST([bitcoin_protocol_ISYS_CPPFLAGS], [${bitcoin_protocol_OTHER_CFLAGS}])])
173236
AC_MSG_NOTICE([bitcoin_protocol_CPPFLAGS : ${bitcoin_protocol_CPPFLAGS}])
237+
AC_MSG_NOTICE([bitcoin_protocol_ISYS_CPPFLAGS : ${bitcoin_protocol_ISYS_CPPFLAGS}])
238+
AC_MSG_NOTICE([bitcoin_protocol_OTHER_CFLAGS : ${bitcoin_protocol_OTHER_CFLAGS}])
239+
AC_MSG_NOTICE([bitcoin_protocol_INCLUDEDIR : ${bitcoin_protocol_INCLUDEDIR}])
174240
AC_MSG_NOTICE([bitcoin_protocol_LIBS : ${bitcoin_protocol_LIBS}])
175241

242+
AS_CASE([${enable_isystem}],[yes],
243+
[AC_SUBST([bitcoin_protocol_BUILD_CPPFLAGS], [${bitcoin_protocol_ISYS_CPPFLAGS}])],
244+
[AC_SUBST([bitcoin_protocol_BUILD_CPPFLAGS], [${bitcoin_protocol_CPPFLAGS}])])
245+
246+
AC_MSG_NOTICE([bitcoin_protocol_BUILD_CPPFLAGS : ${bitcoin_protocol_BUILD_CPPFLAGS}])
247+
176248

177249
# Set flags.
178250
#==============================================================================
@@ -188,12 +260,24 @@ AS_CASE([${CC}], [*],
188260
[AX_CHECK_COMPILE_FLAG([-Wall],
189261
[CFLAGS="$CFLAGS -Wall"])])
190262

263+
# Warn on all stuff.
264+
#------------------------------------------------------------------------------
265+
AS_CASE([${CC}], [*],
266+
[AX_CHECK_COMPILE_FLAG([-Wall],
267+
[CXXFLAGS="$CXXFLAGS -Wall"])])
268+
191269
# Warn on extra stuff.
192270
#------------------------------------------------------------------------------
193271
AS_CASE([${CC}], [*],
194272
[AX_CHECK_COMPILE_FLAG([-Wextra],
195273
[CFLAGS="$CFLAGS -Wextra"])])
196274

275+
# Warn on extra stuff.
276+
#------------------------------------------------------------------------------
277+
AS_CASE([${CC}], [*],
278+
[AX_CHECK_COMPILE_FLAG([-Wextra],
279+
[CXXFLAGS="$CXXFLAGS -Wextra"])])
280+
197281
# Be really annoying.
198282
#------------------------------------------------------------------------------
199283
AS_CASE([${CC}], [*],
@@ -202,6 +286,26 @@ AS_CASE([${CC}], [*],
202286
[AX_CHECK_COMPILE_FLAG([-pedantic],
203287
[CFLAGS="$CFLAGS -pedantic"])])])
204288

289+
# Be really annoying.
290+
#------------------------------------------------------------------------------
291+
AS_CASE([${CC}], [*],
292+
[AX_CHECK_COMPILE_FLAG([-Wpedantic],
293+
[CXXFLAGS="$CXXFLAGS -Wpedantic"],
294+
[AX_CHECK_COMPILE_FLAG([-pedantic],
295+
[CXXFLAGS="$CXXFLAGS -pedantic"])])])
296+
297+
# Disallow warning on style order of declarations.
298+
#------------------------------------------------------------------------------
299+
AS_CASE([${CC}], [*],
300+
[AX_CHECK_COMPILE_FLAG([-Wno-reorder],
301+
[CXXFLAGS="$CXXFLAGS -Wno-reorder"])])
302+
303+
# Suppress warning for incomplete field initialization.
304+
#------------------------------------------------------------------------------
305+
AS_CASE([${CC}], [*],
306+
[AX_CHECK_COMPILE_FLAG([-Wno-missing-field-initializers],
307+
[CXXFLAGS="$CXXFLAGS -Wno-missing-field-initializers"])])
308+
205309
# Conform to style.
206310
#------------------------------------------------------------------------------
207311
AS_CASE([${CC}], [*],
@@ -214,18 +318,6 @@ AS_CASE([${CC}], [*clang*],
214318
[AX_CHECK_COMPILE_FLAG([-Wno-mismatched-tags],
215319
[CXXFLAGS="$CXXFLAGS -Wno-mismatched-tags"])])
216320

217-
# Clean up boost 1.55 headers. Enabled in gcc only.
218-
#------------------------------------------------------------------------------
219-
AS_CASE([${CC}], [*gcc*],
220-
[AX_CHECK_COMPILE_FLAG([-Wno-deprecated-declarations],
221-
[CXXFLAGS="$CXXFLAGS -Wno-deprecated-declarations"])])
222-
223-
# Clean up boost 1.55 headers. Enabled in clang only.
224-
#------------------------------------------------------------------------------
225-
AS_CASE([${CC}], [*clang*],
226-
[AX_CHECK_COMPILE_FLAG([-Wno-redeclared-class-member],
227-
[CXXFLAGS="$CXXFLAGS -Wno-redeclared-class-member"])])
228-
229321
# Protect stack.
230322
#------------------------------------------------------------------------------
231323
AS_CASE([${CC}], [*],
@@ -238,12 +330,6 @@ AS_CASE([${CC}], [*],
238330
[AX_CHECK_LINK_FLAG([-fstack-protector-all],
239331
[LDFLAGS="$LDFLAGS -fstack-protector-all"])])
240332

241-
# Hide internal functions from external libs. Enabled in gcc only.
242-
#------------------------------------------------------------------------------
243-
AS_CASE([${CC}], [*gcc*],
244-
[AX_CHECK_COMPILE_FLAG([-fvisibility-hidden],
245-
[CXXFLAGS="$CXXFLAGS -fvisibility-hidden"])])
246-
247333
# Hide inlines from external libs. Enabled in gcc only.
248334
#------------------------------------------------------------------------------
249335
AS_CASE([${CC}], [*gcc*],

0 commit comments

Comments
 (0)