Merge pull request #965 from pmienk/master

Regenerate artifacts.

Author: pmienk

.github/workflows/ci.yml

@@ -207,7 +207,7 @@ jobs:
 
       - name: Execute install.sh
         run: >
-          CXXFLAGS="${CXXFLAGS} -I${{ env.LIBBITCOIN_SRC_PATH }}prefix/include/bitcoin/ssl" ./install.sh
+          ./install.sh
           --build-dir=${{ env.LIBBITCOIN_SRC_PATH }} ${{ matrix.options }}
           --prefix=${{ env.LIBBITCOIN_SRC_PATH }}prefix
           ${{ env.LINKAGE }}
@@ -481,7 +481,7 @@ jobs:
 
       - name: Execute install-cmake.sh
         run: >
-          CXXFLAGS="${CXXFLAGS} -I${{ env.LIBBITCOIN_SRC_PATH }}prefix/include/bitcoin/ssl" ./install-cmake.sh
+          ./install-cmake.sh
           --build-dir=${{ env.LIBBITCOIN_SRC_PATH }} ${{ matrix.options }}
           --prefix=${{ env.LIBBITCOIN_SRC_PATH }}prefix
           ${{ env.LINKAGE }}
@@ -717,7 +717,7 @@ jobs:
 
       - name: Execute install-cmakepresets.sh
         run: >
-          CXXFLAGS="${CXXFLAGS} -I${{ env.LIBBITCOIN_SRC_PATH }}prefix/include/bitcoin/ssl" ./install-cmakepresets.sh
+          ./install-cmakepresets.sh
           --build-dir=${{ env.LIBBITCOIN_SRC_PATH }} ${{ matrix.options }}
           --prefix=${{ env.LIBBITCOIN_SRC_PATH }}prefix/${{ matrix.preset }}
           --preset=${{ matrix.preset }}

builds/msvc/vs2022/libbitcoin-node-test/libbitcoin-node-test.vcxproj

@@ -137,7 +137,9 @@
     <ClCompile Include="..\..\..\..\test\protocols\protocol.cpp" />
     <ClCompile Include="..\..\..\..\test\sessions\session.cpp" />
     <ClCompile Include="..\..\..\..\test\settings.cpp" />
-    <ClCompile Include="..\..\..\..\test\test.cpp" />
+    <ClCompile Include="..\..\..\..\test\test.cpp">
+      <ObjectFileName>$(IntDir)test_test.obj</ObjectFileName>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\test\test.hpp" />

configure.ac

@@ -263,18 +263,15 @@ AS_CASE([${with_tests}], [yes],
 # Require bash-completion of at least version 2.0.0 and output ${bash_completion_CPPFLAGS/LIBS/PKG}.
 #------------------------------------------------------------------------------
 AS_CASE([${bash_completiondir}], [yes],
-    [PKG_CHECK_MODULES([bash_completion], [bash-completion >= 2.0.0],
-        [bash_completion_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "bash-completion >= 2.0.0" 2>/dev/null`"
-         bash_completion_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "bash-completion >= 2.0.0" 2>/dev/null`"
-         bash_completiondir="`$PKG_CONFIG --variable=completionsdir "bash-completion >= 2.0.0" 2>/dev/null`"],
-        [bash_completion_INCLUDEDIR=""
-         bash_completion_OTHER_CFLAGS=""
-         bash_completiondir="${datadir}/bash-completion/completions"])
+    [PKG_CHECK_MODULES([bash_completion], [bash-completion >= 2.0.0], [],
+        [
+          bash_completion_INCLUDEDIR=""
+          bash_completion_OTHER_CFLAGS=""
+          bash_completiondir="${datadir}/bash-completion/completions"
+        ])
      AC_SUBST([bash_completion_PKG], ['bash-completion >= 2.0.0'])
      AC_SUBST([bash_completion_CPPFLAGS], [${bash_completion_CFLAGS}])
-     AS_IF([test x${bash_completion_INCLUDEDIR} != "x"],
-        [AC_SUBST([bash_completion_ISYS_CPPFLAGS], ["-isystem${bash_completion_INCLUDEDIR} ${bash_completion_OTHER_CFLAGS}"])],
-        [AC_SUBST([bash_completion_ISYS_CPPFLAGS], [${bash_completion_OTHER_CFLAGS}])])
+     AC_SUBST([bash_completion_ISYS_CPPFLAGS], [`echo ${bash_completion_CPPFLAGS} | $SED s/^-I/-isystem/g | $SED s/' -I'/' -isystem'/g`]])
      AC_MSG_NOTICE([bash_completion_CPPFLAGS : ${bash_completion_CPPFLAGS}])
      AC_MSG_NOTICE([bash_completion_ISYS_CPPFLAGS : ${bash_completion_ISYS_CPPFLAGS}])
      AC_MSG_NOTICE([bash_completion_OTHER_CFLAGS : ${bash_completion_OTHER_CFLAGS}])
@@ -290,15 +287,13 @@ AC_MSG_NOTICE([bash_completion_BUILD_CPPFLAGS : ${bash_completion_BUILD_CPPFLAGS
 
 # Require bitcoin-database of at least version 4.0.0 and output ${bitcoin_database_CPPFLAGS/LIBS/PKG}.
 #------------------------------------------------------------------------------
-PKG_CHECK_MODULES([bitcoin_database], [libbitcoin-database >= 4.0.0],
-    [bitcoin_database_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-database >= 4.0.0" 2>/dev/null`"
-     bitcoin_database_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-database >= 4.0.0" 2>/dev/null`"],
-    [AC_MSG_ERROR([libbitcoin-database >= 4.0.0 is required but was not found.])])
+PKG_CHECK_MODULES([bitcoin_database], [libbitcoin-database >= 4.0.0], [],
+    [
+      AC_MSG_ERROR([libbitcoin-database >= 4.0.0 is required but was not found.])
+    ])
 AC_SUBST([bitcoin_database_PKG], ['libbitcoin-database >= 4.0.0'])
 AC_SUBST([bitcoin_database_CPPFLAGS], [${bitcoin_database_CFLAGS}])
-AS_IF([test x${bitcoin_database_INCLUDEDIR} != "x"],
-    [AC_SUBST([bitcoin_database_ISYS_CPPFLAGS], ["-isystem${bitcoin_database_INCLUDEDIR} ${bitcoin_database_OTHER_CFLAGS}"])],
-    [AC_SUBST([bitcoin_database_ISYS_CPPFLAGS], [${bitcoin_database_OTHER_CFLAGS}])])
+AC_SUBST([bitcoin_database_ISYS_CPPFLAGS], [`echo ${bitcoin_database_CPPFLAGS} | $SED s/^-I/-isystem/g | $SED s/' -I'/' -isystem'/g`]])
 AC_MSG_NOTICE([bitcoin_database_CPPFLAGS : ${bitcoin_database_CPPFLAGS}])
 AC_MSG_NOTICE([bitcoin_database_ISYS_CPPFLAGS : ${bitcoin_database_ISYS_CPPFLAGS}])
 AC_MSG_NOTICE([bitcoin_database_OTHER_CFLAGS : ${bitcoin_database_OTHER_CFLAGS}])
@@ -313,15 +308,13 @@ AC_MSG_NOTICE([bitcoin_database_BUILD_CPPFLAGS : ${bitcoin_database_BUILD_CPPFLA
 
 # Require bitcoin-network of at least version 4.0.0 and output ${bitcoin_network_CPPFLAGS/LIBS/PKG}.
 #------------------------------------------------------------------------------
-PKG_CHECK_MODULES([bitcoin_network], [libbitcoin-network >= 4.0.0],
-    [bitcoin_network_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-network >= 4.0.0" 2>/dev/null`"
-     bitcoin_network_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-network >= 4.0.0" 2>/dev/null`"],
-    [AC_MSG_ERROR([libbitcoin-network >= 4.0.0 is required but was not found.])])
+PKG_CHECK_MODULES([bitcoin_network], [libbitcoin-network >= 4.0.0], [],
+    [
+      AC_MSG_ERROR([libbitcoin-network >= 4.0.0 is required but was not found.])
+    ])
 AC_SUBST([bitcoin_network_PKG], ['libbitcoin-network >= 4.0.0'])
 AC_SUBST([bitcoin_network_CPPFLAGS], [${bitcoin_network_CFLAGS}])
-AS_IF([test x${bitcoin_network_INCLUDEDIR} != "x"],
-    [AC_SUBST([bitcoin_network_ISYS_CPPFLAGS], ["-isystem${bitcoin_network_INCLUDEDIR} ${bitcoin_network_OTHER_CFLAGS}"])],
-    [AC_SUBST([bitcoin_network_ISYS_CPPFLAGS], [${bitcoin_network_OTHER_CFLAGS}])])
+AC_SUBST([bitcoin_network_ISYS_CPPFLAGS], [`echo ${bitcoin_network_CPPFLAGS} | $SED s/^-I/-isystem/g | $SED s/' -I'/' -isystem'/g`]])
 AC_MSG_NOTICE([bitcoin_network_CPPFLAGS : ${bitcoin_network_CPPFLAGS}])
 AC_MSG_NOTICE([bitcoin_network_ISYS_CPPFLAGS : ${bitcoin_network_ISYS_CPPFLAGS}])
 AC_MSG_NOTICE([bitcoin_network_OTHER_CFLAGS : ${bitcoin_network_OTHER_CFLAGS}])

libbitcoin-node.pc.in

@@ -12,7 +12,6 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-
 # Metadata
 #==============================================================================
 Name: libbitcoin-node