From 20d8028ead83e678aa255bf13c28c4946440d538 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 29 Apr 2026 18:08:11 +0000 Subject: [PATCH] Upgrade depends OpenSSL to 3.5 LTS --- configure | 794 ++++++++++++++++++++-------------- depends/packages/openssl.mk | 49 +-- src/init.cpp | 6 + src/qt/paymentrequestplus.cpp | 13 +- src/qt/rpcconsole.cpp | 4 + 5 files changed, 493 insertions(+), 373 deletions(-) diff --git a/configure b/configure index 07ac201f..4ed2c7ff 100755 --- a/configure +++ b/configure @@ -880,6 +880,7 @@ ac_ct_AR AR DLLTOOL OBJDUMP +FILECMD LN_S NM ac_ct_DUMPBIN @@ -1059,7 +1060,6 @@ with_boost_program_options with_boost_thread with_boost_chrono with_boost_unit_test_framework -with_unsupported_ssl ' ac_precious_vars='build_alias host_alias @@ -1878,8 +1878,6 @@ Optional Packages: is possible to specify a certain library for the linker e.g. --with-boost-unit-test-framework=boost_unit_test_framework-gcc - --with-unsupported-ssl Build with system SSL (default is no; DANGEROUS; NOT - SUPPORTED; You should use OpenSSL 1.0) Some influential environment variables: ARFLAGS Flags for the archiver, defaults to if not set @@ -4888,11 +4886,11 @@ if test x$ac_prog_cxx_stdcxx = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 printf %s "checking for $CXX option to enable C++11 features... " >&6; } -if test ${ac_cv_prog_cxx_11+y} +if test ${ac_cv_prog_cxx_cxx11+y} then : printf %s "(cached) " >&6 else $as_nop - ac_cv_prog_cxx_11=no + ac_cv_prog_cxx_cxx11=no ac_save_CXX=$CXX cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -4934,11 +4932,11 @@ if test x$ac_prog_cxx_stdcxx = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5 printf %s "checking for $CXX option to enable C++98 features... " >&6; } -if test ${ac_cv_prog_cxx_98+y} +if test ${ac_cv_prog_cxx_cxx98+y} then : printf %s "(cached) " >&6 else $as_nop - ac_cv_prog_cxx_98=no + ac_cv_prog_cxx_cxx98=no ac_save_CXX=$CXX cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -6037,8 +6035,8 @@ esac -macro_version='2.4.6' -macro_revision='2.4.6' +macro_version='2.4.7' +macro_revision='2.4.7' @@ -7521,13 +7519,13 @@ else mingw*) lt_bad_file=conftest.nm/nofile ;; *) lt_bad_file=/dev/null ;; esac - case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" break 2 ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" break 2 @@ -7665,7 +7663,7 @@ esac fi fi - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in *COFF*) DUMPBIN="$DUMPBIN -symbols -headers" ;; @@ -7769,7 +7767,7 @@ else $as_nop lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -7812,7 +7810,7 @@ else $as_nop sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` + lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[ ]//'` else lt_cv_sys_max_cmd_len=32768 fi @@ -8017,6 +8015,114 @@ esac +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}file", so it can be a program name with args. +set dummy ${ac_tool_prefix}file; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_FILECMD+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$FILECMD"; then + ac_cv_prog_FILECMD="$FILECMD" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_FILECMD="${ac_tool_prefix}file" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +FILECMD=$ac_cv_prog_FILECMD +if test -n "$FILECMD"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5 +printf "%s\n" "$FILECMD" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_FILECMD"; then + ac_ct_FILECMD=$FILECMD + # Extract the first word of "file", so it can be a program name with args. +set dummy file; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_FILECMD+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_FILECMD"; then + ac_cv_prog_ac_ct_FILECMD="$ac_ct_FILECMD" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_FILECMD="file" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_FILECMD=$ac_cv_prog_ac_ct_FILECMD +if test -n "$ac_ct_FILECMD"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FILECMD" >&5 +printf "%s\n" "$ac_ct_FILECMD" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_FILECMD" = x; then + FILECMD=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + FILECMD=$ac_ct_FILECMD + fi +else + FILECMD="$ac_cv_prog_FILECMD" +fi + + + + + + + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 @@ -8160,7 +8266,7 @@ beos*) bsdi[45]*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_cmd='$FILECMD -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -8194,14 +8300,14 @@ darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; esac @@ -8215,7 +8321,7 @@ haiku*) ;; hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' @@ -8262,7 +8368,7 @@ netbsd* | netbsdelf*-gnu) newos6*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; @@ -8636,13 +8742,29 @@ esac fi : ${AR=ar} -: ${AR_FLAGS=cr} +# Use ARFLAGS variable as AR's operation code to sync the variable naming with +# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have +# higher priority because thats what people were doing historically (setting +# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS +# variable obsoleted/removed. + +test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} +lt_ar_flags=$AR_FLAGS + + + + + + +# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override +# by AR_FLAGS because that was never working and AR_FLAGS is about to die. + @@ -9059,7 +9181,7 @@ esac if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'" # Adjust the below global symbol transforms to fixup imported variables. lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" @@ -9077,20 +9199,20 @@ fi # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ $lt_cdecl_hook\ " -e 's/^T .* \(.*\)$/extern int \1();/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ $lt_c_name_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" # Transform an extracted symbol line into symbol name with lib prefix and # symbol address. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ $lt_c_name_lib_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ @@ -9114,7 +9236,7 @@ for ac_symprfx in "" "_"; do if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Fake it for dumpbin and say T for any non-static function, # D for any global variable and I for any imported variable. - # Also find C++ and __fastcall symbols from MSVC++, + # Also find C++ and __fastcall symbols from MSVC++ or ICC, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ @@ -9132,9 +9254,9 @@ for ac_symprfx in "" "_"; do " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx" else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -9334,7 +9456,7 @@ case $with_sysroot in #( fi ;; #( /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` ;; #( no|'') ;; #( @@ -9459,7 +9581,7 @@ ia64-*-hpux*) ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE=32 ;; @@ -9480,7 +9602,7 @@ ia64-*-hpux*) printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then if test yes = "$lt_cv_prog_gnu_ld"; then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" ;; @@ -9492,7 +9614,7 @@ ia64-*-hpux*) ;; esac else - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" ;; @@ -9518,7 +9640,7 @@ mips64*-*linux*) printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then emul=elf - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) emul="${emul}32" ;; @@ -9526,7 +9648,7 @@ mips64*-*linux*) emul="${emul}64" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *MSB*) emul="${emul}btsmip" ;; @@ -9534,7 +9656,7 @@ mips64*-*linux*) emul="${emul}ltsmip" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *N32*) emul="${emul}n32" ;; @@ -9558,14 +9680,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *32-bit*) case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *x86-64*) LD="${LD-ld} -m elf32_x86_64" ;; @@ -9673,7 +9795,7 @@ printf "%s\n" "$lt_cv_cc_needs_belf" >&6; } ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in yes*) @@ -10456,8 +10578,8 @@ int forced_loaded() { return 2;} _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cr libconftest.a conftest.o" >&5 - $AR cr libconftest.a conftest.o 2>&5 + echo "$AR $AR_FLAGS libconftest.a conftest.o" >&5 + $AR $AR_FLAGS libconftest.a conftest.o 2>&5 echo "$RANLIB libconftest.a" >&5 $RANLIB libconftest.a 2>&5 cat > conftest.c << _LT_EOF @@ -10484,17 +10606,12 @@ printf "%s\n" "$lt_cv_ld_force_load" >&6; } _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[912]*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - 10.[012][,.]*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*|11.*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + darwin*) + case $MACOSX_DEPLOYMENT_TARGET,$host in + 10.[012],*|,*powerpc*-darwin[5-8]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + *) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac @@ -10891,8 +11008,8 @@ esac ofile=libtool can_build_shared=yes -# All known linkers require a '.a' archive for static linking (except MSVC, -# which needs '.lib'). +# All known linkers require a '.a' archive for static linking (except MSVC and +# ICC, which need '.lib'). libext=a with_gnu_ld=$lt_cv_prog_gnu_ld @@ -11410,7 +11527,7 @@ lt_prog_compiler_static= lt_prog_compiler_static='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' @@ -11833,15 +11950,15 @@ printf %s "checking whether the $compiler linker ($LD) supports shared libraries case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time + # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. if test yes != "$GCC"; then with_gnu_ld=no fi ;; interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) + # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) with_gnu_ld=yes ;; openbsd* | bitrig*) @@ -11896,7 +12013,7 @@ printf %s "checking whether the $compiler linker ($LD) supports shared libraries whole_archive_flag_spec= fi supports_anon_versioning=no - case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in + case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -12008,6 +12125,7 @@ _LT_EOF emximp -o $lib $output_objdir/$libname.def' old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' enable_shared_with_static_runtimes=yes + file_list_spec='@' ;; interix[3-9]*) @@ -12022,7 +12140,7 @@ _LT_EOF # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) @@ -12065,7 +12183,7 @@ _LT_EOF compiler_needs_object=yes ;; esac - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C 5.9 whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes @@ -12077,13 +12195,14 @@ _LT_EOF if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in tcc*) + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' export_dynamic_flag_spec='-rdynamic' ;; xlf* | bgf* | bgxlf* | mpixlf*) @@ -12093,7 +12212,7 @@ _LT_EOF archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi @@ -12225,7 +12344,7 @@ _LT_EOF if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no @@ -12496,12 +12615,12 @@ fi cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. case $cc_basename in - cl*) - # Native MSVC + cl* | icl*) + # Native MSVC or ICC hardcode_libdir_flag_spec=' ' allow_undefined_flag=unsupported always_export_symbols=yes @@ -12542,7 +12661,7 @@ fi fi' ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper hardcode_libdir_flag_spec=' ' allow_undefined_flag=unsupported # Tell ltmain to make .lib files, not .a files. @@ -12583,8 +12702,8 @@ fi output_verbose_link_cmd=func_echo_all archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + archive_expsym_cmds="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" else ld_shlibs=no @@ -12618,7 +12737,7 @@ fi ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -12799,6 +12918,7 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; } # Fabrice Bellard et al's Tiny C Compiler ld_shlibs=yes archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' ;; esac ;; @@ -12870,6 +12990,7 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; } emximp -o $lib $output_objdir/$libname.def' old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' enable_shared_with_static_runtimes=yes + file_list_spec='@' ;; osf3*) @@ -13562,7 +13683,7 @@ cygwin* | mingw* | pw32* | cegcc*) case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; @@ -13572,14 +13693,14 @@ cygwin* | mingw* | pw32* | cegcc*) ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' ;; - *,cl*) - # Native MSVC + *,cl* | *,icl*) + # Native MSVC or ICC libname_spec='$name' soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' library_names_spec='$libname.dll.lib' @@ -13598,7 +13719,7 @@ cygwin* | mingw* | pw32* | cegcc*) done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -13635,7 +13756,7 @@ cygwin* | mingw* | pw32* | cegcc*) ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; @@ -13668,7 +13789,7 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -14833,30 +14954,41 @@ striplib= old_striplib= { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 printf %s "checking whether stripping libraries is possible... " >&6; } -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } +if test -z "$STRIP"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP"; then + if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + else + case $host_os in + darwin*) + # FIXME - insert some real tests, host_os isn't really good enough striplib="$STRIP -x" old_striplib="$STRIP -S" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - else + ;; + freebsd*) + if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + ;; + *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - fi - ;; - *) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - ;; - esac + ;; + esac + fi fi @@ -15626,8 +15758,8 @@ fi cygwin* | mingw* | pw32* | cegcc*) case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC + ,cl* | no,cl* | ,icl* | no,icl*) + # Native MSVC or ICC # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec_CXX=' ' @@ -15718,11 +15850,11 @@ fi output_verbose_link_cmd=func_echo_all archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - module_expsym_cmds_CXX="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + archive_expsym_cmds_CXX="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds_CXX="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" if test yes != "$lt_cv_apple_cc_single_mod"; then archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" - archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + archive_expsym_cmds_CXX="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi else @@ -15757,6 +15889,7 @@ fi emximp -o $lib $output_objdir/$libname.def' old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' enable_shared_with_static_runtimes_CXX=yes + file_list_spec_CXX='@' ;; dgux*) @@ -15787,7 +15920,7 @@ fi archive_cmds_need_lc_CXX=no ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions ld_shlibs_CXX=yes @@ -15924,7 +16057,7 @@ fi # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_CXX='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds_CXX='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in @@ -16064,13 +16197,13 @@ fi archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' if test yes = "$supports_anon_versioning"; then archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 no_undefined_flag_CXX=' -zdefs' @@ -16727,7 +16860,7 @@ lt_prog_compiler_static_CXX= ;; esac ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -16810,7 +16943,7 @@ lt_prog_compiler_static_CXX= lt_prog_compiler_static_CXX='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 lt_prog_compiler_pic_CXX='-KPIC' @@ -17197,7 +17330,7 @@ printf %s "checking whether the $compiler linker ($LD) supports shared libraries if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) @@ -17205,7 +17338,7 @@ printf %s "checking whether the $compiler linker ($LD) supports shared libraries ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) + cl* | icl*) exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' ;; *) @@ -17556,7 +17689,7 @@ cygwin* | mingw* | pw32* | cegcc*) case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; mingw* | cegcc*) @@ -17565,14 +17698,14 @@ cygwin* | mingw* | pw32* | cegcc*) ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' ;; - *,cl*) - # Native MSVC + *,cl* | *,icl*) + # Native MSVC or ICC libname_spec='$name' soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' library_names_spec='$libname.dll.lib' @@ -17591,7 +17724,7 @@ cygwin* | mingw* | pw32* | cegcc*) done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -17628,7 +17761,7 @@ cygwin* | mingw* | pw32* | cegcc*) ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; @@ -17660,7 +17793,7 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -26367,24 +26500,24 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - QT5_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$qt5_modules" 2>&1` + QT5_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$qt5_modules" 2>&1` else - QT5_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$qt5_modules" 2>&1` + QT5_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$qt5_modules" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$QT5_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$QT5_PKG_ERRORS" >&5 - have_qt=no + have_qt=no elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - have_qt=no + have_qt=no else - QT5_CFLAGS=$pkg_cv_QT5_CFLAGS - QT5_LIBS=$pkg_cv_QT5_LIBS + QT5_CFLAGS=$pkg_cv_QT5_CFLAGS + QT5_LIBS=$pkg_cv_QT5_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - QT_INCLUDES="$QT5_CFLAGS"; QT_LIBS="$QT5_LIBS" have_qt=yes + QT_INCLUDES="$QT5_CFLAGS"; QT_LIBS="$QT5_LIBS" have_qt=yes fi if test "x$have_qt" != xyes; then @@ -26464,24 +26597,24 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - QT_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "${QT_LIB_PREFIX}Test" 2>&1` + QT_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "${QT_LIB_PREFIX}Test" 2>&1` else - QT_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "${QT_LIB_PREFIX}Test" 2>&1` + QT_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "${QT_LIB_PREFIX}Test" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$QT_TEST_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$QT_TEST_PKG_ERRORS" >&5 - have_qt_test=no + have_qt_test=no elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - have_qt_test=no + have_qt_test=no else - QT_TEST_CFLAGS=$pkg_cv_QT_TEST_CFLAGS - QT_TEST_LIBS=$pkg_cv_QT_TEST_LIBS + QT_TEST_CFLAGS=$pkg_cv_QT_TEST_CFLAGS + QT_TEST_LIBS=$pkg_cv_QT_TEST_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - QT_TEST_INCLUDES="$QT_TEST_CFLAGS"; have_qt_test=yes + QT_TEST_INCLUDES="$QT_TEST_CFLAGS"; have_qt_test=yes fi if test "x$use_dbus" != xno; then @@ -26536,24 +26669,24 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - QT_DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "${QT_LIB_PREFIX}DBus" 2>&1` + QT_DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "${QT_LIB_PREFIX}DBus" 2>&1` else - QT_DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "${QT_LIB_PREFIX}DBus" 2>&1` + QT_DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "${QT_LIB_PREFIX}DBus" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$QT_DBUS_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$QT_DBUS_PKG_ERRORS" >&5 - have_qt_dbus=no + have_qt_dbus=no elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - have_qt_dbus=no + have_qt_dbus=no else - QT_DBUS_CFLAGS=$pkg_cv_QT_DBUS_CFLAGS - QT_DBUS_LIBS=$pkg_cv_QT_DBUS_LIBS + QT_DBUS_CFLAGS=$pkg_cv_QT_DBUS_CFLAGS + QT_DBUS_LIBS=$pkg_cv_QT_DBUS_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - QT_DBUS_INCLUDES="$QT_DBUS_CFLAGS"; have_qt_dbus=yes + QT_DBUS_INCLUDES="$QT_DBUS_CFLAGS"; have_qt_dbus=yes fi fi @@ -27843,14 +27976,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - QTPLATFORM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5PlatformSupport" 2>&1` + QTPLATFORM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5PlatformSupport" 2>&1` else - QTPLATFORM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5PlatformSupport" 2>&1` + QTPLATFORM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5PlatformSupport" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$QTPLATFORM_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$QTPLATFORM_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (Qt5PlatformSupport) were not met: + as_fn_error $? "Package requirements (Qt5PlatformSupport) were not met: $QTPLATFORM_PKG_ERRORS @@ -27863,7 +27996,7 @@ See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -27876,11 +28009,11 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - QTPLATFORM_CFLAGS=$pkg_cv_QTPLATFORM_CFLAGS - QTPLATFORM_LIBS=$pkg_cv_QTPLATFORM_LIBS + QTPLATFORM_CFLAGS=$pkg_cv_QTPLATFORM_CFLAGS + QTPLATFORM_LIBS=$pkg_cv_QTPLATFORM_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - QT_LIBS="$QTPLATFORM_LIBS $QT_LIBS" + QT_LIBS="$QTPLATFORM_LIBS $QT_LIBS" fi else @@ -27935,14 +28068,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - QTFONTDATABASE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5FontDatabaseSupport" 2>&1` + QTFONTDATABASE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5FontDatabaseSupport" 2>&1` else - QTFONTDATABASE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5FontDatabaseSupport" 2>&1` + QTFONTDATABASE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5FontDatabaseSupport" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$QTFONTDATABASE_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$QTFONTDATABASE_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (Qt5FontDatabaseSupport) were not met: + as_fn_error $? "Package requirements (Qt5FontDatabaseSupport) were not met: $QTFONTDATABASE_PKG_ERRORS @@ -27955,7 +28088,7 @@ See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -27968,11 +28101,11 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - QTFONTDATABASE_CFLAGS=$pkg_cv_QTFONTDATABASE_CFLAGS - QTFONTDATABASE_LIBS=$pkg_cv_QTFONTDATABASE_LIBS + QTFONTDATABASE_CFLAGS=$pkg_cv_QTFONTDATABASE_CFLAGS + QTFONTDATABASE_LIBS=$pkg_cv_QTFONTDATABASE_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - QT_LIBS="-lQt5FontDatabaseSupport $QT_LIBS" + QT_LIBS="-lQt5FontDatabaseSupport $QT_LIBS" fi pkg_failed=no @@ -28026,14 +28159,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - QTEVENTDISPATCHER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5EventDispatcherSupport" 2>&1` + QTEVENTDISPATCHER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5EventDispatcherSupport" 2>&1` else - QTEVENTDISPATCHER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5EventDispatcherSupport" 2>&1` + QTEVENTDISPATCHER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5EventDispatcherSupport" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$QTEVENTDISPATCHER_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$QTEVENTDISPATCHER_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (Qt5EventDispatcherSupport) were not met: + as_fn_error $? "Package requirements (Qt5EventDispatcherSupport) were not met: $QTEVENTDISPATCHER_PKG_ERRORS @@ -28046,7 +28179,7 @@ See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -28059,11 +28192,11 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - QTEVENTDISPATCHER_CFLAGS=$pkg_cv_QTEVENTDISPATCHER_CFLAGS - QTEVENTDISPATCHER_LIBS=$pkg_cv_QTEVENTDISPATCHER_LIBS + QTEVENTDISPATCHER_CFLAGS=$pkg_cv_QTEVENTDISPATCHER_CFLAGS + QTEVENTDISPATCHER_LIBS=$pkg_cv_QTEVENTDISPATCHER_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - QT_LIBS="-lQt5EventDispatcherSupport $QT_LIBS" + QT_LIBS="-lQt5EventDispatcherSupport $QT_LIBS" fi pkg_failed=no @@ -28117,14 +28250,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - QTTHEME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5ThemeSupport" 2>&1` + QTTHEME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5ThemeSupport" 2>&1` else - QTTHEME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5ThemeSupport" 2>&1` + QTTHEME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5ThemeSupport" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$QTTHEME_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$QTTHEME_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (Qt5ThemeSupport) were not met: + as_fn_error $? "Package requirements (Qt5ThemeSupport) were not met: $QTTHEME_PKG_ERRORS @@ -28137,7 +28270,7 @@ See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -28150,11 +28283,11 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - QTTHEME_CFLAGS=$pkg_cv_QTTHEME_CFLAGS - QTTHEME_LIBS=$pkg_cv_QTTHEME_LIBS + QTTHEME_CFLAGS=$pkg_cv_QTTHEME_CFLAGS + QTTHEME_LIBS=$pkg_cv_QTTHEME_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - QT_LIBS="-lQt5ThemeSupport $QT_LIBS" + QT_LIBS="-lQt5ThemeSupport $QT_LIBS" fi pkg_failed=no @@ -28208,14 +28341,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - QTDEVICEDISCOVERY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5DeviceDiscoverySupport" 2>&1` + QTDEVICEDISCOVERY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5DeviceDiscoverySupport" 2>&1` else - QTDEVICEDISCOVERY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5DeviceDiscoverySupport" 2>&1` + QTDEVICEDISCOVERY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5DeviceDiscoverySupport" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$QTDEVICEDISCOVERY_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$QTDEVICEDISCOVERY_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (Qt5DeviceDiscoverySupport) were not met: + as_fn_error $? "Package requirements (Qt5DeviceDiscoverySupport) were not met: $QTDEVICEDISCOVERY_PKG_ERRORS @@ -28228,7 +28361,7 @@ See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -28241,11 +28374,11 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - QTDEVICEDISCOVERY_CFLAGS=$pkg_cv_QTDEVICEDISCOVERY_CFLAGS - QTDEVICEDISCOVERY_LIBS=$pkg_cv_QTDEVICEDISCOVERY_LIBS + QTDEVICEDISCOVERY_CFLAGS=$pkg_cv_QTDEVICEDISCOVERY_CFLAGS + QTDEVICEDISCOVERY_LIBS=$pkg_cv_QTDEVICEDISCOVERY_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - QT_LIBS="-lQt5DeviceDiscoverySupport $QT_LIBS" + QT_LIBS="-lQt5DeviceDiscoverySupport $QT_LIBS" fi pkg_failed=no @@ -28299,14 +28432,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - QTACCESSIBILITY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5AccessibilitySupport" 2>&1` + QTACCESSIBILITY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5AccessibilitySupport" 2>&1` else - QTACCESSIBILITY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5AccessibilitySupport" 2>&1` + QTACCESSIBILITY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5AccessibilitySupport" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$QTACCESSIBILITY_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$QTACCESSIBILITY_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (Qt5AccessibilitySupport) were not met: + as_fn_error $? "Package requirements (Qt5AccessibilitySupport) were not met: $QTACCESSIBILITY_PKG_ERRORS @@ -28319,7 +28452,7 @@ See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -28332,11 +28465,11 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - QTACCESSIBILITY_CFLAGS=$pkg_cv_QTACCESSIBILITY_CFLAGS - QTACCESSIBILITY_LIBS=$pkg_cv_QTACCESSIBILITY_LIBS + QTACCESSIBILITY_CFLAGS=$pkg_cv_QTACCESSIBILITY_CFLAGS + QTACCESSIBILITY_LIBS=$pkg_cv_QTACCESSIBILITY_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - QT_LIBS="-lQt5AccessibilitySupport $QT_LIBS" + QT_LIBS="-lQt5AccessibilitySupport $QT_LIBS" fi pkg_failed=no @@ -28390,14 +28523,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - QTFB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5FbSupport" 2>&1` + QTFB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5FbSupport" 2>&1` else - QTFB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5FbSupport" 2>&1` + QTFB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5FbSupport" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$QTFB_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$QTFB_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (Qt5FbSupport) were not met: + as_fn_error $? "Package requirements (Qt5FbSupport) were not met: $QTFB_PKG_ERRORS @@ -28410,7 +28543,7 @@ See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -28423,11 +28556,11 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - QTFB_CFLAGS=$pkg_cv_QTFB_CFLAGS - QTFB_LIBS=$pkg_cv_QTFB_LIBS + QTFB_CFLAGS=$pkg_cv_QTFB_CFLAGS + QTFB_LIBS=$pkg_cv_QTFB_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - QT_LIBS="-lQt5FbSupport $QT_LIBS" + QT_LIBS="-lQt5FbSupport $QT_LIBS" fi fi if test "x$TARGET_OS" = xlinux; then @@ -28483,14 +28616,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - X11XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x11-xcb" 2>&1` + X11XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x11-xcb" 2>&1` else - X11XCB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x11-xcb" 2>&1` + X11XCB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x11-xcb" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$X11XCB_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$X11XCB_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (x11-xcb) were not met: + as_fn_error $? "Package requirements (x11-xcb) were not met: $X11XCB_PKG_ERRORS @@ -28503,7 +28636,7 @@ See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -28516,11 +28649,11 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - X11XCB_CFLAGS=$pkg_cv_X11XCB_CFLAGS - X11XCB_LIBS=$pkg_cv_X11XCB_LIBS + X11XCB_CFLAGS=$pkg_cv_X11XCB_CFLAGS + X11XCB_LIBS=$pkg_cv_X11XCB_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - QT_LIBS="$X11XCB_LIBS $QT_LIBS" + QT_LIBS="$X11XCB_LIBS $QT_LIBS" fi if ${PKG_CONFIG} --exists "Qt5Core >= 5.5" 2>/dev/null; then @@ -28575,14 +28708,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - QTXCBQPA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5XcbQpa" 2>&1` + QTXCBQPA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5XcbQpa" 2>&1` else - QTXCBQPA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5XcbQpa" 2>&1` + QTXCBQPA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5XcbQpa" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$QTXCBQPA_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$QTXCBQPA_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (Qt5XcbQpa) were not met: + as_fn_error $? "Package requirements (Qt5XcbQpa) were not met: $QTXCBQPA_PKG_ERRORS @@ -28595,7 +28728,7 @@ See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -28608,11 +28741,11 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - QTXCBQPA_CFLAGS=$pkg_cv_QTXCBQPA_CFLAGS - QTXCBQPA_LIBS=$pkg_cv_QTXCBQPA_LIBS + QTXCBQPA_CFLAGS=$pkg_cv_QTXCBQPA_CFLAGS + QTXCBQPA_LIBS=$pkg_cv_QTXCBQPA_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - QT_LIBS="$QTXCBQPA_LIBS $QT_LIBS" + QT_LIBS="$QTXCBQPA_LIBS $QT_LIBS" fi fi elif test "x$TARGET_OS" = xdarwin; then @@ -28668,14 +28801,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - QTCLIPBOARD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5ClipboardSupport" 2>&1` + QTCLIPBOARD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5ClipboardSupport" 2>&1` else - QTCLIPBOARD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5ClipboardSupport" 2>&1` + QTCLIPBOARD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5ClipboardSupport" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$QTCLIPBOARD_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$QTCLIPBOARD_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (Qt5ClipboardSupport) were not met: + as_fn_error $? "Package requirements (Qt5ClipboardSupport) were not met: $QTCLIPBOARD_PKG_ERRORS @@ -28688,7 +28821,7 @@ See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -28701,11 +28834,11 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - QTCLIPBOARD_CFLAGS=$pkg_cv_QTCLIPBOARD_CFLAGS - QTCLIPBOARD_LIBS=$pkg_cv_QTCLIPBOARD_LIBS + QTCLIPBOARD_CFLAGS=$pkg_cv_QTCLIPBOARD_CFLAGS + QTCLIPBOARD_LIBS=$pkg_cv_QTCLIPBOARD_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - QT_LIBS="-lQt5ClipboardSupport $QT_LIBS" + QT_LIBS="-lQt5ClipboardSupport $QT_LIBS" fi pkg_failed=no @@ -28759,14 +28892,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - QTGRAPHICS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5GraphicsSupport" 2>&1` + QTGRAPHICS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5GraphicsSupport" 2>&1` else - QTGRAPHICS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5GraphicsSupport" 2>&1` + QTGRAPHICS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5GraphicsSupport" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$QTGRAPHICS_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$QTGRAPHICS_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (Qt5GraphicsSupport) were not met: + as_fn_error $? "Package requirements (Qt5GraphicsSupport) were not met: $QTGRAPHICS_PKG_ERRORS @@ -28779,7 +28912,7 @@ See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -28792,11 +28925,11 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - QTGRAPHICS_CFLAGS=$pkg_cv_QTGRAPHICS_CFLAGS - QTGRAPHICS_LIBS=$pkg_cv_QTGRAPHICS_LIBS + QTGRAPHICS_CFLAGS=$pkg_cv_QTGRAPHICS_CFLAGS + QTGRAPHICS_LIBS=$pkg_cv_QTGRAPHICS_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - QT_LIBS="-lQt5GraphicsSupport $QT_LIBS" + QT_LIBS="-lQt5GraphicsSupport $QT_LIBS" fi pkg_failed=no @@ -28850,14 +28983,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - QTCGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5CglSupport" 2>&1` + QTCGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5CglSupport" 2>&1` else - QTCGL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5CglSupport" 2>&1` + QTCGL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5CglSupport" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$QTCGL_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$QTCGL_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (Qt5CglSupport) were not met: + as_fn_error $? "Package requirements (Qt5CglSupport) were not met: $QTCGL_PKG_ERRORS @@ -28870,7 +29003,7 @@ See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -28883,11 +29016,11 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - QTCGL_CFLAGS=$pkg_cv_QTCGL_CFLAGS - QTCGL_LIBS=$pkg_cv_QTCGL_LIBS + QTCGL_CFLAGS=$pkg_cv_QTCGL_CFLAGS + QTCGL_LIBS=$pkg_cv_QTCGL_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - QT_LIBS="-lQt5CglSupport $QT_LIBS" + QT_LIBS="-lQt5CglSupport $QT_LIBS" fi fi @@ -30719,7 +30852,7 @@ printf %s "checking for boostlib >= $boost_lib_version_req... " >&6; } libsubdirs="lib/`$CXX -dumpmachine 2>/dev/null` $libsubdirs" if test "$ac_boost_path" != ""; then - BOOST_CPPFLAGS="-I$ac_boost_path/include" + BOOST_CPPFLAGS="-isystem $ac_boost_path/include" for ac_boost_path_tmp in $libsubdirs; do if test -d "$ac_boost_path"/"$ac_boost_path_tmp" ; then BOOST_LDFLAGS="-L$ac_boost_path/$ac_boost_path_tmp" @@ -30733,7 +30866,7 @@ printf %s "checking for boostlib >= $boost_lib_version_req... " >&6; } if ls "$ac_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi done BOOST_LDFLAGS="-L$ac_boost_path_tmp/$libsubdir" - BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include" + BOOST_CPPFLAGS="-isystem $ac_boost_path_tmp/include" break; fi done @@ -30811,11 +30944,11 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu _version=$_version_tmp fi VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'` - BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE" + BOOST_CPPFLAGS="-isystem $ac_boost_path/include/boost-$VERSION_UNDERSCORE" done if test -z "$BOOST_CPPFLAGS"; then if test -d "$ac_boost_path/boost" && test -r "$ac_boost_path/boost"; then - BOOST_CPPFLAGS="-I$ac_boost_path" + BOOST_CPPFLAGS="-isystem $ac_boost_path" fi fi fi @@ -30835,7 +30968,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu done VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'` - BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE" + BOOST_CPPFLAGS="-isystem $best_path/include/boost-$VERSION_UNDERSCORE" if test "$ac_boost_lib_path" = ""; then for libsubdir in $libsubdirs ; do if ls "$best_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi @@ -30856,7 +30989,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: We will use a staged boost library from $BOOST_ROOT" >&5 printf "%s\n" "$as_me: We will use a staged boost library from $BOOST_ROOT" >&6;} - BOOST_CPPFLAGS="-I$BOOST_ROOT" + BOOST_CPPFLAGS="-isystem $BOOST_ROOT" BOOST_LDFLAGS="-L$BOOST_ROOT/stage/$libsubdir" fi fi @@ -32664,21 +32797,21 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libssl" 2>&1` + SSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libssl" 2>&1` else - SSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libssl" 2>&1` + SSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libssl" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SSL_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SSL_PKG_ERRORS" >&5 - as_fn_error $? "openssl not found." "$LINENO" 5 + as_fn_error $? "openssl not found." "$LINENO" 5 elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - as_fn_error $? "openssl not found." "$LINENO" 5 + as_fn_error $? "openssl not found." "$LINENO" 5 else - SSL_CFLAGS=$pkg_cv_SSL_CFLAGS - SSL_LIBS=$pkg_cv_SSL_LIBS + SSL_CFLAGS=$pkg_cv_SSL_CFLAGS + SSL_LIBS=$pkg_cv_SSL_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -32735,21 +32868,21 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - CRYPTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcrypto" 2>&1` + CRYPTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcrypto" 2>&1` else - CRYPTO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcrypto" 2>&1` + CRYPTO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcrypto" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$CRYPTO_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$CRYPTO_PKG_ERRORS" >&5 - as_fn_error $? "libcrypto not found." "$LINENO" 5 + as_fn_error $? "libcrypto not found." "$LINENO" 5 elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - as_fn_error $? "libcrypto not found." "$LINENO" 5 + as_fn_error $? "libcrypto not found." "$LINENO" 5 else - CRYPTO_CFLAGS=$pkg_cv_CRYPTO_CFLAGS - CRYPTO_LIBS=$pkg_cv_CRYPTO_LIBS + CRYPTO_CFLAGS=$pkg_cv_CRYPTO_CFLAGS + CRYPTO_LIBS=$pkg_cv_CRYPTO_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -32809,12 +32942,12 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PROTOBUF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "protobuf" 2>&1` + PROTOBUF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "protobuf" 2>&1` else - PROTOBUF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "protobuf" 2>&1` + PROTOBUF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "protobuf" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$PROTOBUF_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$PROTOBUF_PKG_ERRORS" >&5 if test "x$bitcoin_qt_want_version" = xauto && test "x$bitcoin_qt_force" != xyes; then @@ -32844,11 +32977,11 @@ printf "%s\n" "$as_me: WARNING: libprotobuf not found; agrarian-qt frontend will fi else - PROTOBUF_CFLAGS=$pkg_cv_PROTOBUF_CFLAGS - PROTOBUF_LIBS=$pkg_cv_PROTOBUF_LIBS + PROTOBUF_CFLAGS=$pkg_cv_PROTOBUF_CFLAGS + PROTOBUF_LIBS=$pkg_cv_PROTOBUF_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_protobuf=yes + have_protobuf=yes fi else true @@ -32911,24 +33044,24 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - QR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libqrencode" 2>&1` + QR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libqrencode" 2>&1` else - QR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libqrencode" 2>&1` + QR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libqrencode" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$QR_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$QR_PKG_ERRORS" >&5 - have_qrencode=no + have_qrencode=no elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - have_qrencode=no + have_qrencode=no else - QR_CFLAGS=$pkg_cv_QR_CFLAGS - QR_LIBS=$pkg_cv_QR_LIBS + QR_CFLAGS=$pkg_cv_QR_CFLAGS + QR_LIBS=$pkg_cv_QR_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_qrencode=yes + have_qrencode=yes fi else true @@ -32989,21 +33122,21 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EVENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libevent" 2>&1` + EVENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libevent" 2>&1` else - EVENT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libevent" 2>&1` + EVENT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libevent" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$EVENT_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$EVENT_PKG_ERRORS" >&5 - as_fn_error $? "libevent not found." "$LINENO" 5 + as_fn_error $? "libevent not found." "$LINENO" 5 elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - as_fn_error $? "libevent not found." "$LINENO" 5 + as_fn_error $? "libevent not found." "$LINENO" 5 else - EVENT_CFLAGS=$pkg_cv_EVENT_CFLAGS - EVENT_LIBS=$pkg_cv_EVENT_LIBS + EVENT_CFLAGS=$pkg_cv_EVENT_CFLAGS + EVENT_LIBS=$pkg_cv_EVENT_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -33061,21 +33194,21 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EVENT_PTHREADS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libevent_pthreads" 2>&1` + EVENT_PTHREADS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libevent_pthreads" 2>&1` else - EVENT_PTHREADS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libevent_pthreads" 2>&1` + EVENT_PTHREADS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libevent_pthreads" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$EVENT_PTHREADS_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$EVENT_PTHREADS_PKG_ERRORS" >&5 - as_fn_error $? "libevent_pthreads not found." "$LINENO" 5 + as_fn_error $? "libevent_pthreads not found." "$LINENO" 5 elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - as_fn_error $? "libevent_pthreads not found." "$LINENO" 5 + as_fn_error $? "libevent_pthreads not found." "$LINENO" 5 else - EVENT_PTHREADS_CFLAGS=$pkg_cv_EVENT_PTHREADS_CFLAGS - EVENT_PTHREADS_LIBS=$pkg_cv_EVENT_PTHREADS_LIBS + EVENT_PTHREADS_CFLAGS=$pkg_cv_EVENT_PTHREADS_CFLAGS + EVENT_PTHREADS_LIBS=$pkg_cv_EVENT_PTHREADS_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -33136,12 +33269,12 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - ZMQ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libzmq >= 4" 2>&1` + ZMQ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libzmq >= 4" 2>&1` else - ZMQ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libzmq >= 4" 2>&1` + ZMQ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libzmq >= 4" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$ZMQ_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$ZMQ_PKG_ERRORS" >&5 printf "%s\n" "#define ENABLE_ZMQ 0" >>confdefs.h @@ -33159,8 +33292,8 @@ printf "%s\n" "#define ENABLE_ZMQ 0" >>confdefs.h printf "%s\n" "$as_me: WARNING: libzmq version 4.x or greater not found, disabling" >&2;} use_zmq=no else - ZMQ_CFLAGS=$pkg_cv_ZMQ_CFLAGS - ZMQ_LIBS=$pkg_cv_ZMQ_LIBS + ZMQ_CFLAGS=$pkg_cv_ZMQ_CFLAGS + ZMQ_LIBS=$pkg_cv_ZMQ_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -33635,17 +33768,8 @@ then : else $as_nop - -# Check whether --with-unsupported-ssl was given. -if test ${with_unsupported_ssl+y} -then : - withval=$with_unsupported_ssl; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Detected unsupported SSL version: This is NOT supported, and may break consensus compatibility!" >&5 -printf "%s\n" "$as_me: WARNING: Detected unsupported SSL version: This is NOT supported, and may break consensus compatibility!" >&2;} -else $as_nop - as_fn_error $? "Detected unsupported SSL version: This is NOT supported, and may break consensus compatibility!" "$LINENO" 5 - -fi - + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: RAND_egd is unavailable in this OpenSSL version; continuing with the modern libcrypto RNG API" >&5 +printf "%s\n" "$as_me: WARNING: RAND_egd is unavailable in this OpenSSL version; continuing with the modern libcrypto RNG API" >&2;} fi @@ -33714,24 +33838,24 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - UNIVALUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libunivalue >= 1.0.4" 2>&1` + UNIVALUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libunivalue >= 1.0.4" 2>&1` else - UNIVALUE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libunivalue >= 1.0.4" 2>&1` + UNIVALUE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libunivalue >= 1.0.4" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$UNIVALUE_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$UNIVALUE_PKG_ERRORS" >&5 - true + true elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - true + true else - UNIVALUE_CFLAGS=$pkg_cv_UNIVALUE_CFLAGS - UNIVALUE_LIBS=$pkg_cv_UNIVALUE_LIBS + UNIVALUE_CFLAGS=$pkg_cv_UNIVALUE_CFLAGS + UNIVALUE_LIBS=$pkg_cv_UNIVALUE_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - found_univalue=yes + found_univalue=yes fi @@ -35502,6 +35626,7 @@ lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_q lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' +FILECMD='`$ECHO "$FILECMD" | $SED "$delay_single_quote_subst"`' OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' @@ -35510,6 +35635,7 @@ want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' +lt_ar_flags='`$ECHO "$lt_ar_flags" | $SED "$delay_single_quote_subst"`' AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' @@ -35684,6 +35810,7 @@ LN_S \ lt_SP2NL \ lt_NL2SP \ reload_flag \ +FILECMD \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -35692,7 +35819,6 @@ want_nocaseglob \ DLLTOOL \ sharedlib_from_linklib_cmd \ AR \ -AR_FLAGS \ archiver_list_spec \ STRIP \ RANLIB \ @@ -36722,6 +36848,9 @@ to_host_file_cmd=$lt_cv_to_host_file_cmd # convert \$build files to toolchain format. to_tool_file_cmd=$lt_cv_to_tool_file_cmd +# A file(cmd) program that detects file types. +FILECMD=$lt_FILECMD + # An object symbol dumper. OBJDUMP=$lt_OBJDUMP @@ -36746,8 +36875,11 @@ sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd # The archiver. AR=$lt_AR +# Flags to create an archive (by configure). +lt_ar_flags=$lt_ar_flags + # Flags to create an archive. -AR_FLAGS=$lt_AR_FLAGS +AR_FLAGS=\${ARFLAGS-"\$lt_ar_flags"} # How to feed a file listing to the archiver. archiver_list_spec=$lt_archiver_list_spec @@ -37137,7 +37269,7 @@ ltmain=$ac_aux_dir/ltmain.sh # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ + $SED '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) mv -f "$cfgfile" "$ofile" || diff --git a/depends/packages/openssl.mk b/depends/packages/openssl.mk index 4f2e14fb..852b29c8 100644 --- a/depends/packages/openssl.mk +++ b/depends/packages/openssl.mk @@ -1,45 +1,19 @@ package=openssl -$(package)_version=1.0.1k -$(package)_download_path=https://openssl-library.org/source/old/1.0.1 +$(package)_version=3.5.6 +$(package)_download_path=https://github.com/openssl/openssl/releases/download/openssl-$($(package)_version) $(package)_file_name=$(package)-$($(package)_version).tar.gz -$(package)_sha256_hash=8f9faeaebad088e772f4ef5e38252d472be4d878c6b3a2718c10a4fcebe7a41c +$(package)_sha256_hash=deae7c80cba99c4b4f940ecadb3c3338b13cb77418409238e57d7f31f2a3b736 define $(package)_set_vars -$(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)" -$(package)_config_opts=--prefix=$(host_prefix) --openssldir=$(host_prefix)/etc/openssl -$(package)_config_opts+=no-camellia -$(package)_config_opts+=no-capieng -$(package)_config_opts+=no-cast +$(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)" CXX="$($(package)_cxx)" +$(package)_config_opts=--prefix=$(host_prefix) --openssldir=$(host_prefix)/etc/openssl --libdir=lib $(package)_config_opts+=no-comp +$(package)_config_opts+=no-docs $(package)_config_opts+=no-dso -$(package)_config_opts+=no-dtls1 -$(package)_config_opts+=no-ec_nistp_64_gcc_128 -$(package)_config_opts+=no-gost -$(package)_config_opts+=no-gmp -$(package)_config_opts+=no-heartbeats -$(package)_config_opts+=no-idea -$(package)_config_opts+=no-jpake -$(package)_config_opts+=no-krb5 -$(package)_config_opts+=no-libunbound -$(package)_config_opts+=no-md2 -$(package)_config_opts+=no-mdc2 -$(package)_config_opts+=no-rc4 -$(package)_config_opts+=no-rc5 -$(package)_config_opts+=no-rdrand -$(package)_config_opts+=no-rfc3779 -$(package)_config_opts+=no-rsax -$(package)_config_opts+=no-sctp -$(package)_config_opts+=no-seed -$(package)_config_opts+=no-sha0 +$(package)_config_opts+=no-tests $(package)_config_opts+=no-shared -$(package)_config_opts+=no-ssl-trace -$(package)_config_opts+=no-ssl2 $(package)_config_opts+=no-ssl3 -$(package)_config_opts+=no-static_engine -$(package)_config_opts+=no-store -$(package)_config_opts+=no-unit-test $(package)_config_opts+=no-weak-ssl-ciphers -$(package)_config_opts+=no-whirlpool $(package)_config_opts+=no-zlib $(package)_config_opts+=no-zlib-dynamic $(package)_config_opts+=$($(package)_cflags) $($(package)_cppflags) @@ -64,17 +38,12 @@ $(package)_config_opts_x86_64_mingw32=mingw64 $(package)_config_opts_i686_mingw32=mingw endef -define $(package)_preprocess_cmds - sed -i.old "/define DATE/d" util/mkbuildinf.pl && \ - sed -i.old "s|engines apps test|engines|" Makefile.org -endef - define $(package)_config_cmds ./Configure $($(package)_config_opts) endef define $(package)_build_cmds - $(MAKE) -j1 build_libs libcrypto.pc libssl.pc openssl.pc + $(MAKE) build_libs libcrypto.pc libssl.pc openssl.pc endef define $(package)_stage_cmds @@ -83,4 +52,4 @@ endef define $(package)_postprocess_cmds rm -rf share bin etc -endef \ No newline at end of file +endef diff --git a/src/init.cpp b/src/init.cpp index c0ef1717..1b4dec3f 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -53,6 +53,8 @@ #include #include +#include + #ifndef WIN32 #include #endif @@ -1055,7 +1057,11 @@ bool AppInit2() ShrinkDebugFile(); LogPrintf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); LogPrintf("Agrarian version %s (%s)\n", FormatFullVersion(), CLIENT_DATE); +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + LogPrintf("Using OpenSSL version %s\n", OpenSSL_version(OPENSSL_VERSION)); +#else LogPrintf("Using OpenSSL version %s\n", SSLeay_version(SSLEAY_VERSION)); +#endif #ifdef ENABLE_WALLET LogPrintf("Using BerkeleyDB version %s\n", DbEnv::version(0, 0, 0)); #endif diff --git a/src/qt/paymentrequestplus.cpp b/src/qt/paymentrequestplus.cpp index d3555035..6f147e23 100644 --- a/src/qt/paymentrequestplus.cpp +++ b/src/qt/paymentrequestplus.cpp @@ -116,9 +116,18 @@ bool PaymentRequestPlus::getMerchant(X509_STORE* certStore, QString& merchant) c // The first cert is the signing cert, the rest are untrusted certs that chain // to a valid root authority. OpenSSL needs them separately. - STACK_OF(X509)* chain = sk_X509_new_null(); + STACK_OF(X509)* chain = +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + reinterpret_cast(OPENSSL_sk_new_null()); +#else + sk_X509_new_null(); +#endif for (int i = certs.size() - 1; i > 0; i--) { +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + OPENSSL_sk_push(reinterpret_cast(chain), reinterpret_cast(certs[i])); +#else sk_X509_push(chain, certs[i]); +#endif } X509* signing_cert = certs[0]; @@ -159,9 +168,9 @@ bool PaymentRequestPlus::getMerchant(X509_STORE* certStore, QString& merchant) c EVP_MD_CTX _ctx; EVP_MD_CTX *ctx; ctx = &_ctx; + EVP_MD_CTX_init(ctx); #endif EVP_PKEY* pubkey = X509_get_pubkey(signing_cert); - EVP_MD_CTX_init(ctx); if (!EVP_VerifyInit_ex(ctx, digestAlgorithm, NULL) || !EVP_VerifyUpdate(ctx, data_to_verify.data(), data_to_verify.size()) || !EVP_VerifyFinal(ctx, (const unsigned char*)paymentRequest.signature().data(), paymentRequest.signature().size(), pubkey)) { diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index 3e451065..8d571af5 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -286,7 +286,11 @@ RPCConsole::RPCConsole(QWidget* parent) : QDialog(parent, Qt::WindowSystemMenuHi connect(ui->btn_resync, SIGNAL(clicked()), this, SLOT(walletResync())); // set library version labels +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + ui->openSSLVersion->setText(OpenSSL_version(OPENSSL_VERSION)); +#else ui->openSSLVersion->setText(SSLeay_version(SSLEAY_VERSION)); +#endif #ifdef ENABLE_WALLET std::string strPathCustom = GetArg("-backuppath", ""); std::string strzAGRPathCustom = GetArg("-zagrbackuppath", "");