--- nono/configure 2026/04/29 17:05:26 1.1.1.15 +++ nono/configure 2026/04/29 17:05:56 1.1.1.20 @@ -640,15 +640,20 @@ ac_includes_default="\ ac_header_cxx_list= ac_subst_vars='LTLIBOBJS LIBOBJS -ICONV_LIBS -ICONV_CPPFLAGS -NONO_LIBS -NONO_CPPFLAGS +LIBS_ICONV +CPPFLAGS_ICONV MSGFMT -WXWIDGETS_LIBS -WXWIDGETS_CPPFLAGS +LIBS_WXWIDGETS +CPPFLAGS_WXWIDGETS WITH_GUI WX_MAJORMINOR +LIBS_SOUND +HOSTSOUND_SNDIO +HOSTSOUND_NETBSD +HOSTSOUND_ALSA +LIBS_SLIRP +CPPFLAGS_SLIRP +HOSTNET_SLIRP HOSTNET_BPF HOSTNET_TAP HOSTNET_AFPACKET @@ -722,6 +727,8 @@ ac_user_opts=' enable_option_checking enable_avx2 enable_neon +with_libslirp +with_alsa with_gui ' ac_precious_vars='build_alias @@ -1363,6 +1370,9 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --without-libslirp disable usermode network (using SLIRP) + --with-alsa enable ALSA support (default:yes on Linux, otherwise + no) --without-gui disable GUI support Some influential environment variables: @@ -1741,6 +1751,50 @@ fi as_fn_set_status $ac_retval } # ac_fn_cxx_try_link + +# ac_fn_cxx_try_run LINENO +# ------------------------ +# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that +# executables *can* be run. +ac_fn_cxx_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } +then : + ac_retval=0 +else case e in #( + e) printf "%s\n" "$as_me: program exited with status $ac_status" >&5 + printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status ;; +esac +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_run ac_configure_args_raw= for ac_arg do @@ -4431,6 +4485,7 @@ printf %s "checking whether cc accepts - cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + int main (void) { @@ -4438,16 +4493,21 @@ main (void) ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } eval `echo cc_has-Wcast-qual=yes | sed -e 's/-/_/g'` WARNFLAGS_C="${WARNFLAGS_C} -Wcast-qual" + else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } ;; + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -4461,6 +4521,7 @@ printf %s "checking whether cc accepts - cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + int main (void) { @@ -4468,16 +4529,21 @@ main (void) ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } eval `echo cc_has-Wextra-semi=yes | sed -e 's/-/_/g'` WARNFLAGS_C="${WARNFLAGS_C} -Wextra-semi" + else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } ;; + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -4491,6 +4557,7 @@ printf %s "checking whether cc accepts - cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + int main (void) { @@ -4498,16 +4565,21 @@ main (void) ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } eval `echo cc_has-Wlogical-op=yes | sed -e 's/-/_/g'` WARNFLAGS_C="${WARNFLAGS_C} -Wlogical-op" + else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } ;; + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -4521,6 +4593,7 @@ printf %s "checking whether cc accepts - cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + int main (void) { @@ -4528,16 +4601,21 @@ main (void) ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } eval `echo cc_has-Wmissing-prototypes=yes | sed -e 's/-/_/g'` WARNFLAGS_C="${WARNFLAGS_C} -Wmissing-prototypes" + else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } ;; + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -4551,6 +4629,7 @@ printf %s "checking whether cc accepts - cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + int main (void) { @@ -4558,16 +4637,21 @@ main (void) ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } eval `echo cc_has-Wmissing-variable-declarations=yes | sed -e 's/-/_/g'` WARNFLAGS_C="${WARNFLAGS_C} -Wmissing-variable-declarations" + else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } ;; + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -4582,6 +4666,7 @@ printf %s "checking whether cc accepts - cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + int main (void) { @@ -4589,16 +4674,21 @@ main (void) ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } eval `echo cc_has-Wshadow-local=yes | sed -e 's/-/_/g'` WARNFLAGS_C="${WARNFLAGS_C} -Wshadow-local" + else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } ;; + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -4613,6 +4703,7 @@ printf %s "checking whether cc accepts - cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + int main (void) { @@ -4620,16 +4711,21 @@ main (void) ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } eval `echo cc_has-Wshadow=yes | sed -e 's/-/_/g'` WARNFLAGS_C="${WARNFLAGS_C} -Wshadow" + else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } ;; + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -4644,6 +4740,7 @@ printf %s "checking whether cc accepts - cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + int main (void) { @@ -4651,16 +4748,21 @@ main (void) ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } eval `echo cc_has-Wstring-conversion=yes | sed -e 's/-/_/g'` WARNFLAGS_C="${WARNFLAGS_C} -Wstring-conversion" + else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } ;; + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -4674,6 +4776,7 @@ printf %s "checking whether cc accepts - cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + int main (void) { @@ -4681,16 +4784,21 @@ main (void) ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } eval `echo cc_has-Wtype-limits=yes | sed -e 's/-/_/g'` WARNFLAGS_C="${WARNFLAGS_C} -Wtype-limits" + else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } ;; + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -4721,6 +4829,7 @@ printf %s "checking whether c++ accepts cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + int main (void) { @@ -4728,16 +4837,21 @@ main (void) ; return 0; } + _ACEOF if ac_fn_cxx_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } eval `echo cxx_has-Wcast-qual=yes | sed -e 's/-/_/g'` WARNFLAGS_CXX="${WARNFLAGS_CXX} -Wcast-qual" + else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } ;; + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -4751,6 +4865,7 @@ printf %s "checking whether c++ accepts cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + int main (void) { @@ -4758,16 +4873,57 @@ main (void) ; return 0; } + _ACEOF if ac_fn_cxx_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } eval `echo cxx_has-Wextra-semi=yes | sed -e 's/-/_/g'` WARNFLAGS_CXX="${WARNFLAGS_CXX} -Wextra-semi" + else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } ;; + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + CXXFLAGS="${old_CXXFLAGS}" + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether c++ accepts -Wimplicit-fallthrough" >&5 +printf %s "checking whether c++ accepts -Wimplicit-fallthrough... " >&6; } + old_CXXFLAGS="${CXXFLAGS}" + CXXFLAGS="${CXXFLAGS} -Werror -Wimplicit-fallthrough" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +int +main (void) +{ + + ; + return 0; +} + +_ACEOF +if ac_fn_cxx_try_compile "$LINENO" +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + eval `echo cxx_has-Wimplicit-fallthrough=yes | sed -e 's/-/_/g'` + WARNFLAGS_CXX="${WARNFLAGS_CXX} -Wimplicit-fallthrough" + +else case e in #( + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -4781,6 +4937,7 @@ printf %s "checking whether c++ accepts cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + int main (void) { @@ -4788,16 +4945,21 @@ main (void) ; return 0; } + _ACEOF if ac_fn_cxx_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } eval `echo cxx_has-Winconsistent-missing-destructor-override=yes | sed -e 's/-/_/g'` WARNFLAGS_CXX="${WARNFLAGS_CXX} -Winconsistent-missing-destructor-override" + else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } ;; + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -4811,6 +4973,7 @@ printf %s "checking whether c++ accepts cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + int main (void) { @@ -4818,16 +4981,21 @@ main (void) ; return 0; } + _ACEOF if ac_fn_cxx_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } eval `echo cxx_has-Winconsistent-missing-override=yes | sed -e 's/-/_/g'` WARNFLAGS_CXX="${WARNFLAGS_CXX} -Winconsistent-missing-override" + else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } ;; + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -4841,6 +5009,7 @@ printf %s "checking whether c++ accepts cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + int main (void) { @@ -4848,16 +5017,21 @@ main (void) ; return 0; } + _ACEOF if ac_fn_cxx_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } eval `echo cxx_has-Wlogical-op=yes | sed -e 's/-/_/g'` WARNFLAGS_CXX="${WARNFLAGS_CXX} -Wlogical-op" + else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } ;; + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -4871,6 +5045,7 @@ printf %s "checking whether c++ accepts cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + int main (void) { @@ -4878,16 +5053,21 @@ main (void) ; return 0; } + _ACEOF if ac_fn_cxx_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } eval `echo cxx_has-Wmissing-prototypes=yes | sed -e 's/-/_/g'` WARNFLAGS_CXX="${WARNFLAGS_CXX} -Wmissing-prototypes" + else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } ;; + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -4901,6 +5081,7 @@ printf %s "checking whether c++ accepts cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + int main (void) { @@ -4908,16 +5089,21 @@ main (void) ; return 0; } + _ACEOF if ac_fn_cxx_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } eval `echo cxx_has-Wmissing-variable-declarations=yes | sed -e 's/-/_/g'` WARNFLAGS_CXX="${WARNFLAGS_CXX} -Wmissing-variable-declarations" + else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } ;; + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -4932,6 +5118,7 @@ printf %s "checking whether c++ accepts cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + int main (void) { @@ -4939,16 +5126,21 @@ main (void) ; return 0; } + _ACEOF if ac_fn_cxx_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } eval `echo cxx_has-Wshadow-local=yes | sed -e 's/-/_/g'` WARNFLAGS_CXX="${WARNFLAGS_CXX} -Wshadow-local" + else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } ;; + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -4963,6 +5155,7 @@ printf %s "checking whether c++ accepts cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + int main (void) { @@ -4970,16 +5163,21 @@ main (void) ; return 0; } + _ACEOF if ac_fn_cxx_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } eval `echo cxx_has-Wshadow=yes | sed -e 's/-/_/g'` WARNFLAGS_CXX="${WARNFLAGS_CXX} -Wshadow" + else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } ;; + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -4994,6 +5192,7 @@ printf %s "checking whether c++ accepts cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + int main (void) { @@ -5001,16 +5200,21 @@ main (void) ; return 0; } + _ACEOF if ac_fn_cxx_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } eval `echo cxx_has-Wstring-conversion=yes | sed -e 's/-/_/g'` WARNFLAGS_CXX="${WARNFLAGS_CXX} -Wstring-conversion" + else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } ;; + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -5024,6 +5228,7 @@ printf %s "checking whether c++ accepts cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + int main (void) { @@ -5031,16 +5236,21 @@ main (void) ; return 0; } + _ACEOF if ac_fn_cxx_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } eval `echo cxx_has-Wsuggest-destructor-override=yes | sed -e 's/-/_/g'` WARNFLAGS_CXX="${WARNFLAGS_CXX} -Wsuggest-destructor-override" + else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } ;; + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -5054,6 +5264,7 @@ printf %s "checking whether c++ accepts cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + int main (void) { @@ -5061,16 +5272,58 @@ main (void) ; return 0; } + _ACEOF if ac_fn_cxx_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } eval `echo cxx_has-Wsuggest-override=yes | sed -e 's/-/_/g'` WARNFLAGS_CXX="${WARNFLAGS_CXX} -Wsuggest-override" + +else case e in #( + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + CXXFLAGS="${old_CXXFLAGS}" + +# gcc14 が C++14 に対しても C++20 のエラーを出そうとする。は?? + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether c++ accepts -Wno-template-id-cdtor" >&5 +printf %s "checking whether c++ accepts -Wno-template-id-cdtor... " >&6; } + old_CXXFLAGS="${CXXFLAGS}" + CXXFLAGS="${CXXFLAGS} -Werror -Wno-template-id-cdtor" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +int +main (void) +{ + + ; + return 0; +} + +_ACEOF +if ac_fn_cxx_try_compile "$LINENO" +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + eval `echo cxx_has-Wno-template-id-cdtor=yes | sed -e 's/-/_/g'` + WARNFLAGS_CXX="${WARNFLAGS_CXX} -Wno-template-id-cdtor" + else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } ;; + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -5084,6 +5337,7 @@ printf %s "checking whether c++ accepts cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + int main (void) { @@ -5091,16 +5345,21 @@ main (void) ; return 0; } + _ACEOF if ac_fn_cxx_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } eval `echo cxx_has-Wtype-limits=yes | sed -e 's/-/_/g'` WARNFLAGS_CXX="${WARNFLAGS_CXX} -Wtype-limits" + else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } ;; + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -5114,6 +5373,7 @@ printf %s "checking whether c++ accepts cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + int main (void) { @@ -5121,16 +5381,21 @@ main (void) ; return 0; } + _ACEOF if ac_fn_cxx_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } eval `echo cxx_has-Wvla-extension=yes | sed -e 's/-/_/g'` WARNFLAGS_CXX="${WARNFLAGS_CXX} -Wvla-extension" + else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } ;; + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -5290,6 +5555,13 @@ then : printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h fi +ac_fn_cxx_check_header_compile "$LINENO" "alsa/asoundlib.h" "ac_cv_header_alsa_asoundlib_h" "$ac_includes_default" +if test "x$ac_cv_header_alsa_asoundlib_h" = xyes +then : + printf "%s\n" "#define HAVE_ALSA_ASOUNDLIB_H 1" >>confdefs.h + +fi + ac_fn_cxx_check_header_compile "$LINENO" "bsd/bsd.h" "ac_cv_header_bsd_bsd_h" "$ac_includes_default" if test "x$ac_cv_header_bsd_bsd_h" = xyes then : @@ -5339,6 +5611,20 @@ then : fi +ac_fn_cxx_check_header_compile "$LINENO" "sndio.h" "ac_cv_header_sndio_h" "$ac_includes_default" +if test "x$ac_cv_header_sndio_h" = xyes +then : + printf "%s\n" "#define HAVE_SNDIO_H 1" >>confdefs.h + +fi + +ac_fn_cxx_check_header_compile "$LINENO" "sys/audioio.h" "ac_cv_header_sys_audioio_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_audioio_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_AUDIOIO_H 1" >>confdefs.h + +fi + ac_fn_cxx_check_header_compile "$LINENO" "sys/cpuset.h" "ac_cv_header_sys_cpuset_h" "$ac_includes_default" if test "x$ac_cv_header_sys_cpuset_h" = xyes then : @@ -5694,6 +5980,70 @@ esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_bitreverse16" >&5 +printf %s "checking for __builtin_bitreverse16... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + return __builtin_bitreverse16(1); + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO" +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + printf "%s\n" "#define HAVE___BUILTIN_BITREVERSE16 1" >>confdefs.h + + +else case e in #( + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_bitreverse32" >&5 +printf %s "checking for __builtin_bitreverse32... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + return __builtin_bitreverse32(1); + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO" +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + printf "%s\n" "#define HAVE___BUILTIN_BITREVERSE32 1" >>confdefs.h + + +else case e in #( + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_bswap16" >&5 printf %s "checking for __builtin_bswap16... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -6472,6 +6822,49 @@ esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for HTOBE16" >&5 +printf %s "checking for HTOBE16... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #if defined(HAVE_ENDIAN_H) + #include + #endif + #if defined(HAVE_SYS_ENDIAN_H) + #include + #endif + #if defined(HAVE_MACHINE_ENDIAN_H) + #include + #endif + +int +main (void) +{ + + uint16_t x = 0; + HTOBE16(x); + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO" +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + printf "%s\n" "#define HAVE_INPLACE_HTOBE16 1" >>confdefs.h + + +else case e in #( + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CPU_COUNT" >&5 printf %s "checking for CPU_COUNT... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -7203,11 +7596,13 @@ printf "%s\n" "yes" >&6; } HOSTNET_AFPACKET=yes + netdriver_afpacket=yes else case e in #( e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } + netdriver_afpacket=no ;; esac fi @@ -7252,16 +7647,17 @@ printf "%s\n" "yes" >&6; } HOSTNET_BPF=yes + netdriver_bpf=yes else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } + netdriver_bpf=no fi # # Other libraries # -# CHECK_LIB($1=name, $2=libs, $3=include, $4=src) PATHS="none /usr/pkg /usr/local" @@ -7479,6 +7875,280 @@ esac fi +# libslirp + +# Check whether --with-libslirp was given. +if test ${with_libslirp+y} +then : + withval=$with_libslirp; +else case e in #( + e) with_libslirp=yes ;; +esac +fi + + +if test "x$with_libslirp" != "xno" +then : + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libslirp" >&5 +printf %s "checking for libslirp... " >&6; } + old_CPPFLAGS=${CPPFLAGS} + old_LIBS=${LIBS} + for path in ${PATHS}; do + case ${path} in + none) + LIBS="-lslirp" + ;; + *) + CPPFLAGS="-I${path}/include" + LIBS="-L${path}/lib -lslirp" + ;; + esac + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + +int +main (void) +{ + + slirp_version_string(); + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO" +then : + + has_libslirp=yes + + if test "$cross_compiling" = yes +then : + { { 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 $? "cannot run test program while cross compiling +See 'config.log' for more details" "$LINENO" 5; } +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + #include + + int main() { + + slirp_version_string(); + ; + return 0; + } + +_ACEOF +if ac_fn_cxx_try_run "$LINENO" +then : + + +else case e in #( + e) + LIBS="-L${path}/lib -Wl,-R,${path}/lib -lslirp" + ;; +esac +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi + + + break + +else case e in #( + e) + has_libslirp=no + ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + done + if test x"${has_libslirp}" = x"yes"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + CPPFLAGS_libslirp=${CPPFLAGS} + LIBS_libslirp=${LIBS} + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + CPPFLAGS=${old_CPPFLAGS} + LIBS=${old_LIBS} + + if test x"${has_libslirp}" = x"yes"; then + printf "%s\n" "#define HAVE_HOSTNET_SLIRP 1" >>confdefs.h + + HOSTNET_SLIRP=yes + + CPPFLAGS_SLIRP=${CPPFLAGS_libslirp} + + LIBS_SLIRP=${LIBS_libslirp} + + else + as_fn_error $? "*** libslirp is not found. +*** If use use pkgsrc, install net/libslirp. +*** If you use Ubuntu, sudo apt install libslirp-dev. +*** Or specify --without-libslirp (it disables hostnet-driver=usermode)." "$LINENO" 5 + fi + +else case e in #( + e) + HOSTNET_SLIRP=no + + ;; +esac +fi + +# ALSA +case "${host_os}" in + linux*) + default_alsa=yes + ;; + *) + default_alsa=no + ;; +esac + +# Check whether --with-alsa was given. +if test ${with_alsa+y} +then : + withval=$with_alsa; with_alsa=${withval} +else case e in #( + e) with_alsa=${default_alsa} ;; +esac +fi + +sounddriver_alsa=no +if test x"${with_alsa}" = xyes; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for snd_pcm_open in -lasound" >&5 +printf %s "checking for snd_pcm_open in -lasound... " >&6; } +if test ${ac_cv_lib_asound_snd_pcm_open+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lasound $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +namespace conftest { + extern "C" int snd_pcm_open (); +} +int +main (void) +{ +return conftest::snd_pcm_open (); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO" +then : + ac_cv_lib_asound_snd_pcm_open=yes +else case e in #( + e) ac_cv_lib_asound_snd_pcm_open=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_asound_snd_pcm_open" >&5 +printf "%s\n" "$ac_cv_lib_asound_snd_pcm_open" >&6; } +if test "x$ac_cv_lib_asound_snd_pcm_open" = xyes +then : + has_asound=yes +else case e in #( + e) has_asound=no ;; +esac +fi + + if test x"${ac_cv_header_alsa_asoundlib_h}" = xyes -a \ + x"${ac_cv_lib_asound_snd_pcm_open}" = xyes; then + printf "%s\n" "#define HAVE_HOSTSOUND_ALSA 1" >>confdefs.h + + HOSTSOUND_ALSA=yes + + LIBS_SOUND="${LIBS_SOUND} -lasound" + sounddriver_alsa=yes + else + as_fn_error $? "*** or libasound not found. +*** If you use Ubuntu, sudo apt install libasound2-dev. +*** Or specify --without-alsa (it disables hostsound-driver=alsa)." "$LINENO" 5 + fi +fi + +# NetBSD audio +if test x"${ac_cv_header_sys_audioio_h}" = xyes; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for AUDIO_GETINFO" >&5 +printf %s "checking for AUDIO_GETINFO... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + #include + #include + +int +main (void) +{ + + struct audio_info info; + AUDIO_INITINFO(&info); + ioctl(0, AUDIO_GETINFO, &info); + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO" +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + printf "%s\n" "#define HAVE_HOSTSOUND_NETBSD 1" >>confdefs.h + + HOSTSOUND_NETBSD=yes + + sounddriver_netbsd=yes + +else case e in #( + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + sounddriver_netbsd=no + ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +# OpenBSD sndio +if test x"${ac_cv_header_sndio_h}" = xyes; then + printf "%s\n" "#define HAVE_HOSTSOUND_SNDIO 1" >>confdefs.h + + HOSTSOUND_SNDIO=yes + + LIBS_SOUND="${LIBS_SOUND} -lsndio" + sounddriver_sndio=yes +else + sounddriver_sndio=no +fi + +LIBS_SOUND=${LIBS_SOUND} + + # wxWidgets # Check whether --with-gui was given. @@ -7526,22 +8196,62 @@ printf "%s\n" "$wxversion" >&6; } wxlibs=`$wxconfig --libs` case "${host_os}" in - netbsd*) - # rpath。どうしたもんだかこれ - wxlibs=`echo $wxlibs | sed -e 's/-L\([^ ]*\) /-L\1 -Wl,-R,\1 /'` - ;; - darwin*) # XXX -framework AudioToolbox が指定されているとリンカがこけるorz wxlibs=`echo $wxlibs | sed -e 's/-framework AudioToolbox//'` ;; esac + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether wx-config requires -Wl,-R" >&5 +printf %s "checking whether wx-config requires -Wl,-R... " >&6; } + old_CPPFLAGS="${CPPFLAGS}" + old_LIBS="${LIBS}" + CPPFLAGS="${CPPFLAGS} ${wxcppflags}" + LIBS="${LIBS} ${wxlibs}" + if test "$cross_compiling" = yes +then : + { { 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 $? "cannot run test program while cross compiling +See 'config.log' for more details" "$LINENO" 5; } +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + int main() { + wxInitializer init; + return !init; + } + +_ACEOF +if ac_fn_cxx_try_run "$LINENO" +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +else case e in #( + e) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + wxlibs=`echo $wxlibs | sed -e 's/-L\([^ ]*\) /-L\1 -Wl,-R,\1 /'` + ;; +esac +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi + + CPPFLAGS="${old_CPPFLAGS}" + LIBS="${old_LIBS}" + WITH_GUI=yes - WXWIDGETS_CPPFLAGS=$wxcppflags + CPPFLAGS_WXWIDGETS=$wxcppflags - WXWIDGETS_LIBS=$wxlibs + LIBS_WXWIDGETS=$wxlibs fi @@ -7664,30 +8374,20 @@ else case e in #( esac fi -# nono 本体のチェックはここまで。 -nono_CPPFLAGS=${CPPFLAGS} -nono_LIBS=${LIBS} -NONO_CPPFLAGS=${nono_CPPFLAGS} - -NONO_LIBS=${nono_LIBS} - - # iconv は util/ でのみ必要。 -CPPFLAGS= -LIBS= { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libiconv" >&5 printf %s "checking for libiconv... " >&6; } + old_CPPFLAGS=${CPPFLAGS} + old_LIBS=${LIBS} for path in ${PATHS}; do - old_CPPFLAGS=${CPPFLAGS} - old_LIBS=${LIBS} case ${path} in none) - LIBS="${LIBS} -liconv" + LIBS="-liconv" ;; *) - CPPFLAGS="${CPPFLAGS} -I${path}/include" - LIBS="${LIBS} -L${path}/lib -liconv" + CPPFLAGS="-I${path}/include" + LIBS="-L${path}/lib -liconv" ;; esac cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -7709,6 +8409,44 @@ if ac_fn_cxx_try_link "$LINENO" then : has_libiconv=yes + + if test "$cross_compiling" = yes +then : + { { 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 $? "cannot run test program while cross compiling +See 'config.log' for more details" "$LINENO" 5; } +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + #include + + int main() { + + iconv_open("", ""); +; + return 0; + } + +_ACEOF +if ac_fn_cxx_try_run "$LINENO" +then : + + +else case e in #( + e) + LIBS="-L${path}/lib -Wl,-R,${path}/lib -liconv" + ;; +esac +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi + + break else case e in #( @@ -7719,23 +8457,29 @@ esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - CPPFLAGS=${old_CPPFLAGS} - LIBS=${old_LIBS} done if test x"${has_libiconv}" = x"yes"; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } + CPPFLAGS_libiconv=${CPPFLAGS} + LIBS_libiconv=${LIBS} else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } fi + CPPFLAGS=${old_CPPFLAGS} + LIBS=${old_LIBS} + +CPPFLAGS_ICONV=${CPPFLAGS_libiconv} + +LIBS_ICONV=${LIBS_libiconv} if test x"${has_libiconv}" = x"yes"; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether iconv needs const" >&5 printf %s "checking whether iconv needs const... " >&6; } old_CPPFLAGS="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} -Werror" + CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_libiconv} -Werror" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7771,14 +8515,7 @@ rm -f core conftest.err conftest.$ac_obj CPPFLAGS="${old_CPPFLAGS}" fi -iconv_CPPFLAGS=${CPPFLAGS} -iconv_LIBS=${LIBS} -ICONV_CPPFLAGS=${iconv_CPPFLAGS} - -ICONV_LIBS=${iconv_LIBS} - - -ac_config_files="$ac_config_files Makefile.cfg host/Makefile wx/Makefile util/mkcgrom/Makefile util/ttfext/Makefile util/viewcgrom/Makefile" +ac_config_files="$ac_config_files Makefile.cfg" ac_config_headers="$ac_config_headers config-nono.h" @@ -8471,11 +9208,6 @@ for ac_config_target in $ac_config_targe do case $ac_config_target in "Makefile.cfg") CONFIG_FILES="$CONFIG_FILES Makefile.cfg" ;; - "host/Makefile") CONFIG_FILES="$CONFIG_FILES host/Makefile" ;; - "wx/Makefile") CONFIG_FILES="$CONFIG_FILES wx/Makefile" ;; - "util/mkcgrom/Makefile") CONFIG_FILES="$CONFIG_FILES util/mkcgrom/Makefile" ;; - "util/ttfext/Makefile") CONFIG_FILES="$CONFIG_FILES util/ttfext/Makefile" ;; - "util/viewcgrom/Makefile") CONFIG_FILES="$CONFIG_FILES util/viewcgrom/Makefile" ;; "config-nono.h") CONFIG_HEADERS="$CONFIG_HEADERS config-nono.h" ;; *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;; @@ -9064,3 +9796,32 @@ printf "%s\n" "$as_me: WARNING: unrecogn fi +# サマリを表示 +echo "" +echo "Configuration summary:" +echo -n "HostNet supports: " +if test x"$netdriver_afpacket" = xyes; then + echo -n " afpacket" +fi +if test x"$netdriver_bpf" = xyes; then + echo -n " bpf" +fi +if test x"$has_libslirp" = xyes; then + echo -n " slirp" +fi +if test x"$netdriver_tap" = xyes; then + echo -n " tap" +fi +echo "" +echo -n "HostSound supports: " +if test x"$sounddriver_alsa" = xyes; then + echo -n " alsa" +fi +if test x"$sounddriver_netbsd" = xyes; then + echo -n " netbsd" +fi +if test x"$sounddriver_sndio" = xyes; then + echo -n " sndio" +fi +echo "" +