@@ -124,79 +124,6 @@ AC_ARG_ENABLE([isystem],
124124AC_MSG_RESULT ( [ $enable_isystem] )
125125
126126
127- # Check dependencies.
128- # ==============================================================================
129- # Require Boost of at least version 1.76.0 and output ${boost_CPPFLAGS/LDFLAGS}.
130- # ------------------------------------------------------------------------------
131- AS_CASE ( [ ${CC}] [ *]
132- [ AX_BOOST_BASE ( [ 1.76.0]
133- [ AC_SUBST ( [ boost_CPPFLAGS] [ ${BOOST_CPPFLAGS}] )
134- AC_SUBST ( [ boost_ISYS_CPPFLAGS] [ `echo ${BOOST_CPPFLAGS} | $SED s/^-I/-isystem/g | $SED s/' -I'/' -isystem'/g`] )
135- AC_SUBST ( [ boost_LDFLAGS] [ ${BOOST_LDFLAGS}] )
136- AC_MSG_NOTICE ( [ boost_CPPFLAGS : ${boost_CPPFLAGS}] )
137- AC_MSG_NOTICE ( [ boost_ISYS_CPPFLAGS : ${boost_ISYS_CPPFLAGS}] )
138- AC_MSG_NOTICE ( [ boost_LDFLAGS : ${boost_LDFLAGS}] ) ] ,
139- [ AC_MSG_ERROR ( [ Boost 1.76.0 or later is required but was not found.] ) ] ) ] )
140-
141- AS_CASE ( [ ${enable_isystem}] [ yes]
142- [ AC_SUBST ( [ boost_BUILD_CPPFLAGS] [ ${boost_ISYS_CPPFLAGS}] ) ]
143- [ AC_SUBST ( [ boost_BUILD_CPPFLAGS] [ ${boost_CPPFLAGS}] ) ] )
144-
145- AC_MSG_NOTICE ( [ boost_BUILD_CPPFLAGS : ${boost_BUILD_CPPFLAGS}] )
146-
147- AS_CASE ( [ ${with_tests}] [ yes]
148- [ AX_BOOST_UNIT_TEST_FRAMEWORK
149- AC_SUBST ( [ boost_unit_test_framework_LIBS] [ ${BOOST_UNIT_TEST_FRAMEWORK_LIB}] )
150- AC_MSG_NOTICE ( [ boost_unit_test_framework_LIBS : ${boost_unit_test_framework_LIBS}] ) ] ,
151- [ AC_SUBST ( [ boost_unit_test_framework_LIBS] [ ] ) ] )
152-
153- # Require zmq of at least version 4.3.4 and output ${zmq_CPPFLAGS/LIBS/PKG}.
154- # ------------------------------------------------------------------------------
155- PKG_CHECK_MODULES([ zmq] [ libzmq >= 4.3.4]
156- [ zmq_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libzmq >= 4.3.4" 2>/dev/null`"
157- zmq_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libzmq >= 4.3.4" 2>/dev/null`"] ,
158- [ AC_MSG_ERROR ( [ libzmq >= 4.3.4 is required but was not found.] ) ]
159- AC_SUBST ( [ zmq_PKG] [ 'libzmq >= 4.3.4'] )
160- AC_SUBST ( [ zmq_CPPFLAGS] [ ${zmq_CFLAGS}] )
161- AS_IF ( [ test x${zmq_INCLUDEDIR} != "x"]
162- [ AC_SUBST ( [ zmq_ISYS_CPPFLAGS] [ "-isystem${zmq_INCLUDEDIR} ${zmq_OTHER_CFLAGS}"] ) ]
163- [ AC_SUBST ( [ zmq_ISYS_CPPFLAGS] [ ${zmq_OTHER_CFLAGS}] ) ] )
164- AC_MSG_NOTICE ( [ zmq_CPPFLAGS : ${zmq_CPPFLAGS}] )
165- AC_MSG_NOTICE ( [ zmq_ISYS_CPPFLAGS : ${zmq_ISYS_CPPFLAGS}] )
166- AC_MSG_NOTICE ( [ zmq_OTHER_CFLAGS : ${zmq_OTHER_CFLAGS}] )
167- AC_MSG_NOTICE ( [ zmq_INCLUDEDIR : ${zmq_INCLUDEDIR}] )
168- AC_MSG_NOTICE ( [ zmq_LIBS : ${zmq_LIBS}] )
169-
170- AS_CASE ( [ ${enable_isystem}] [ yes]
171- [ AC_SUBST ( [ zmq_BUILD_CPPFLAGS] [ ${zmq_ISYS_CPPFLAGS}] ) ]
172- [ AC_SUBST ( [ zmq_BUILD_CPPFLAGS] [ ${zmq_CPPFLAGS}] ) ] )
173-
174- AC_MSG_NOTICE ( [ zmq_BUILD_CPPFLAGS : ${zmq_BUILD_CPPFLAGS}] )
175-
176- # Require bitcoin-system of at least version 4.0.0 and output ${bitcoin_system_CPPFLAGS/LIBS/PKG}.
177- # ------------------------------------------------------------------------------
178- PKG_CHECK_MODULES([ bitcoin_system] [ libbitcoin-system >= 4.0.0]
179- [ bitcoin_system_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-system >= 4.0.0" 2>/dev/null`"
180- bitcoin_system_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-system >= 4.0.0" 2>/dev/null`"] ,
181- [ AC_MSG_ERROR ( [ libbitcoin-system >= 4.0.0 is required but was not found.] ) ]
182- AC_SUBST ( [ bitcoin_system_PKG] [ 'libbitcoin-system >= 4.0.0'] )
183- AC_SUBST ( [ bitcoin_system_CPPFLAGS] [ ${bitcoin_system_CFLAGS}] )
184- AS_IF ( [ test x${bitcoin_system_INCLUDEDIR} != "x"]
185- [ AC_SUBST ( [ bitcoin_system_ISYS_CPPFLAGS] [ "-isystem${bitcoin_system_INCLUDEDIR} ${bitcoin_system_OTHER_CFLAGS}"] ) ]
186- [ AC_SUBST ( [ bitcoin_system_ISYS_CPPFLAGS] [ ${bitcoin_system_OTHER_CFLAGS}] ) ] )
187- AC_MSG_NOTICE ( [ bitcoin_system_CPPFLAGS : ${bitcoin_system_CPPFLAGS}] )
188- AC_MSG_NOTICE ( [ bitcoin_system_ISYS_CPPFLAGS : ${bitcoin_system_ISYS_CPPFLAGS}] )
189- AC_MSG_NOTICE ( [ bitcoin_system_OTHER_CFLAGS : ${bitcoin_system_OTHER_CFLAGS}] )
190- AC_MSG_NOTICE ( [ bitcoin_system_INCLUDEDIR : ${bitcoin_system_INCLUDEDIR}] )
191- AC_MSG_NOTICE ( [ bitcoin_system_LIBS : ${bitcoin_system_LIBS}] )
192-
193- AS_CASE ( [ ${enable_isystem}] [ yes]
194- [ AC_SUBST ( [ bitcoin_system_BUILD_CPPFLAGS] [ ${bitcoin_system_ISYS_CPPFLAGS}] ) ]
195- [ AC_SUBST ( [ bitcoin_system_BUILD_CPPFLAGS] [ ${bitcoin_system_CPPFLAGS}] ) ] )
196-
197- AC_MSG_NOTICE ( [ bitcoin_system_BUILD_CPPFLAGS : ${bitcoin_system_BUILD_CPPFLAGS}] )
198-
199-
200127# Set flags.
201128# ==============================================================================
202129# Require c++20 for all c++ products.
@@ -278,6 +205,79 @@ AS_CASE([${CC}], [*],
278205 [ LDFLAGS="$LDFLAGS -fstack-protector-all"] ) ] )
279206
280207
208+ # Check dependencies.
209+ # ==============================================================================
210+ # Require Boost of at least version 1.76.0 and output ${boost_CPPFLAGS/LDFLAGS}.
211+ # ------------------------------------------------------------------------------
212+ AS_CASE ( [ ${CC}] [ *]
213+ [ AX_BOOST_BASE ( [ 1.76.0]
214+ [ AC_SUBST ( [ boost_CPPFLAGS] [ ${BOOST_CPPFLAGS}] )
215+ AC_SUBST ( [ boost_ISYS_CPPFLAGS] [ `echo ${BOOST_CPPFLAGS} | $SED s/^-I/-isystem/g | $SED s/' -I'/' -isystem'/g`] )
216+ AC_SUBST ( [ boost_LDFLAGS] [ ${BOOST_LDFLAGS}] )
217+ AC_MSG_NOTICE ( [ boost_CPPFLAGS : ${boost_CPPFLAGS}] )
218+ AC_MSG_NOTICE ( [ boost_ISYS_CPPFLAGS : ${boost_ISYS_CPPFLAGS}] )
219+ AC_MSG_NOTICE ( [ boost_LDFLAGS : ${boost_LDFLAGS}] ) ] ,
220+ [ AC_MSG_ERROR ( [ Boost 1.76.0 or later is required but was not found.] ) ] ) ] )
221+
222+ AS_CASE ( [ ${enable_isystem}] [ yes]
223+ [ AC_SUBST ( [ boost_BUILD_CPPFLAGS] [ ${boost_ISYS_CPPFLAGS}] ) ]
224+ [ AC_SUBST ( [ boost_BUILD_CPPFLAGS] [ ${boost_CPPFLAGS}] ) ] )
225+
226+ AC_MSG_NOTICE ( [ boost_BUILD_CPPFLAGS : ${boost_BUILD_CPPFLAGS}] )
227+
228+ AS_CASE ( [ ${with_tests}] [ yes]
229+ [ AX_BOOST_UNIT_TEST_FRAMEWORK
230+ AC_SUBST ( [ boost_unit_test_framework_LIBS] [ ${BOOST_UNIT_TEST_FRAMEWORK_LIB}] )
231+ AC_MSG_NOTICE ( [ boost_unit_test_framework_LIBS : ${boost_unit_test_framework_LIBS}] ) ] ,
232+ [ AC_SUBST ( [ boost_unit_test_framework_LIBS] [ ] ) ] )
233+
234+ # Require zmq of at least version 4.3.4 and output ${zmq_CPPFLAGS/LIBS/PKG}.
235+ # ------------------------------------------------------------------------------
236+ PKG_CHECK_MODULES([ zmq] [ libzmq >= 4.3.4]
237+ [ zmq_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libzmq >= 4.3.4" 2>/dev/null`"
238+ zmq_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libzmq >= 4.3.4" 2>/dev/null`"] ,
239+ [ AC_MSG_ERROR ( [ libzmq >= 4.3.4 is required but was not found.] ) ]
240+ AC_SUBST ( [ zmq_PKG] [ 'libzmq >= 4.3.4'] )
241+ AC_SUBST ( [ zmq_CPPFLAGS] [ ${zmq_CFLAGS}] )
242+ AS_IF ( [ test x${zmq_INCLUDEDIR} != "x"]
243+ [ AC_SUBST ( [ zmq_ISYS_CPPFLAGS] [ "-isystem${zmq_INCLUDEDIR} ${zmq_OTHER_CFLAGS}"] ) ]
244+ [ AC_SUBST ( [ zmq_ISYS_CPPFLAGS] [ ${zmq_OTHER_CFLAGS}] ) ] )
245+ AC_MSG_NOTICE ( [ zmq_CPPFLAGS : ${zmq_CPPFLAGS}] )
246+ AC_MSG_NOTICE ( [ zmq_ISYS_CPPFLAGS : ${zmq_ISYS_CPPFLAGS}] )
247+ AC_MSG_NOTICE ( [ zmq_OTHER_CFLAGS : ${zmq_OTHER_CFLAGS}] )
248+ AC_MSG_NOTICE ( [ zmq_INCLUDEDIR : ${zmq_INCLUDEDIR}] )
249+ AC_MSG_NOTICE ( [ zmq_LIBS : ${zmq_LIBS}] )
250+
251+ AS_CASE ( [ ${enable_isystem}] [ yes]
252+ [ AC_SUBST ( [ zmq_BUILD_CPPFLAGS] [ ${zmq_ISYS_CPPFLAGS}] ) ]
253+ [ AC_SUBST ( [ zmq_BUILD_CPPFLAGS] [ ${zmq_CPPFLAGS}] ) ] )
254+
255+ AC_MSG_NOTICE ( [ zmq_BUILD_CPPFLAGS : ${zmq_BUILD_CPPFLAGS}] )
256+
257+ # Require bitcoin-system of at least version 4.0.0 and output ${bitcoin_system_CPPFLAGS/LIBS/PKG}.
258+ # ------------------------------------------------------------------------------
259+ PKG_CHECK_MODULES([ bitcoin_system] [ libbitcoin-system >= 4.0.0]
260+ [ bitcoin_system_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-system >= 4.0.0" 2>/dev/null`"
261+ bitcoin_system_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-system >= 4.0.0" 2>/dev/null`"] ,
262+ [ AC_MSG_ERROR ( [ libbitcoin-system >= 4.0.0 is required but was not found.] ) ]
263+ AC_SUBST ( [ bitcoin_system_PKG] [ 'libbitcoin-system >= 4.0.0'] )
264+ AC_SUBST ( [ bitcoin_system_CPPFLAGS] [ ${bitcoin_system_CFLAGS}] )
265+ AS_IF ( [ test x${bitcoin_system_INCLUDEDIR} != "x"]
266+ [ AC_SUBST ( [ bitcoin_system_ISYS_CPPFLAGS] [ "-isystem${bitcoin_system_INCLUDEDIR} ${bitcoin_system_OTHER_CFLAGS}"] ) ]
267+ [ AC_SUBST ( [ bitcoin_system_ISYS_CPPFLAGS] [ ${bitcoin_system_OTHER_CFLAGS}] ) ] )
268+ AC_MSG_NOTICE ( [ bitcoin_system_CPPFLAGS : ${bitcoin_system_CPPFLAGS}] )
269+ AC_MSG_NOTICE ( [ bitcoin_system_ISYS_CPPFLAGS : ${bitcoin_system_ISYS_CPPFLAGS}] )
270+ AC_MSG_NOTICE ( [ bitcoin_system_OTHER_CFLAGS : ${bitcoin_system_OTHER_CFLAGS}] )
271+ AC_MSG_NOTICE ( [ bitcoin_system_INCLUDEDIR : ${bitcoin_system_INCLUDEDIR}] )
272+ AC_MSG_NOTICE ( [ bitcoin_system_LIBS : ${bitcoin_system_LIBS}] )
273+
274+ AS_CASE ( [ ${enable_isystem}] [ yes]
275+ [ AC_SUBST ( [ bitcoin_system_BUILD_CPPFLAGS] [ ${bitcoin_system_ISYS_CPPFLAGS}] ) ]
276+ [ AC_SUBST ( [ bitcoin_system_BUILD_CPPFLAGS] [ ${bitcoin_system_CPPFLAGS}] ) ] )
277+
278+ AC_MSG_NOTICE ( [ bitcoin_system_BUILD_CPPFLAGS : ${bitcoin_system_BUILD_CPPFLAGS}] )
279+
280+
281281# Process outputs into templates.
282282# ==============================================================================
283283AC_CONFIG_FILES ( [ Makefile libbitcoin-protocol.pc] )
0 commit comments