--- nono/configure	2026/04/29 17:05:26	1.1.1.15
+++ nono/configure	2026/04/29 17:05:39	1.1.1.17
@@ -640,15 +640,16 @@ 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_SLIRP
+CPPFLAGS_SLIRP
+HOSTNET_SLIRP
 HOSTNET_BPF
 HOSTNET_TAP
 HOSTNET_AFPACKET
@@ -722,6 +723,7 @@ ac_user_opts='
 enable_option_checking
 enable_avx2
 enable_neon
+with_libslirp
 with_gui
 '
       ac_precious_vars='build_alias
@@ -1363,6 +1365,7 @@ 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)
   --without-gui           disable GUI support
 
 Some influential environment variables:
@@ -1741,6 +1744,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 +4478,7 @@ printf %s "checking whether cc accepts -
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 int
 main (void)
 {
@@ -4438,16 +4486,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 +4514,7 @@ printf %s "checking whether cc accepts -
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 int
 main (void)
 {
@@ -4468,16 +4522,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 +4550,7 @@ printf %s "checking whether cc accepts -
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 int
 main (void)
 {
@@ -4498,16 +4558,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 +4586,7 @@ printf %s "checking whether cc accepts -
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 int
 main (void)
 {
@@ -4528,16 +4594,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 +4622,7 @@ printf %s "checking whether cc accepts -
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 int
 main (void)
 {
@@ -4558,16 +4630,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 +4659,7 @@ printf %s "checking whether cc accepts -
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 int
 main (void)
 {
@@ -4589,16 +4667,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 +4696,7 @@ printf %s "checking whether cc accepts -
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 int
 main (void)
 {
@@ -4620,16 +4704,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 +4733,7 @@ printf %s "checking whether cc accepts -
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 int
 main (void)
 {
@@ -4651,16 +4741,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 +4769,7 @@ printf %s "checking whether cc accepts -
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 int
 main (void)
 {
@@ -4681,16 +4777,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 +4822,7 @@ printf %s "checking whether c++ accepts
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 int
 main (void)
 {
@@ -4728,16 +4830,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 +4858,7 @@ printf %s "checking whether c++ accepts
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 int
 main (void)
 {
@@ -4758,16 +4866,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-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
@@ -4781,6 +4894,7 @@ printf %s "checking whether c++ accepts
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 int
 main (void)
 {
@@ -4788,16 +4902,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 +4930,7 @@ printf %s "checking whether c++ accepts
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 int
 main (void)
 {
@@ -4818,16 +4938,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 +4966,7 @@ printf %s "checking whether c++ accepts
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 int
 main (void)
 {
@@ -4848,16 +4974,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 +5002,7 @@ printf %s "checking whether c++ accepts
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 int
 main (void)
 {
@@ -4878,16 +5010,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 +5038,7 @@ printf %s "checking whether c++ accepts
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 int
 main (void)
 {
@@ -4908,16 +5046,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 +5075,7 @@ printf %s "checking whether c++ accepts
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 int
 main (void)
 {
@@ -4939,16 +5083,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 +5112,7 @@ printf %s "checking whether c++ accepts
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 int
 main (void)
 {
@@ -4970,16 +5120,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 +5149,7 @@ printf %s "checking whether c++ accepts
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 int
 main (void)
 {
@@ -5001,16 +5157,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 +5185,7 @@ printf %s "checking whether c++ accepts
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 int
 main (void)
 {
@@ -5031,16 +5193,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 +5221,7 @@ printf %s "checking whether c++ accepts
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 int
 main (void)
 {
@@ -5061,16 +5229,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-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; } ;;
+  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 +5257,7 @@ printf %s "checking whether c++ accepts
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 int
 main (void)
 {
@@ -5091,16 +5265,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 +5293,7 @@ printf %s "checking whether c++ accepts
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 int
 main (void)
 {
@@ -5121,16 +5301,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
@@ -5694,6 +5879,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
@@ -7261,7 +7510,6 @@ fi
 # Other libraries
 #
 
-# CHECK_LIB($1=name, $2=libs, $3=include, $4=src)
 
 
 PATHS="none /usr/pkg /usr/local"
@@ -7479,6 +7727,140 @@ 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 <slirp/libslirp.h>
+
+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 <slirp/libslirp.h>
+
+				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
+
 # wxWidgets
 
 # Check whether --with-gui was given.
@@ -7526,22 +7908,52 @@ 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
 
+				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 <wx/wx.h>
+			class MyApp : public wxApp
+			{
+			 public:
+				bool OnInit() override { return true; }
+			};
+			wxIMPLEMENT_APP(MyApp);
+
+_ACEOF
+if ac_fn_cxx_try_run "$LINENO"
+then :
+
+
+else case e in #(
+  e)
+			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
+
+
 		WITH_GUI=yes
 
-		WXWIDGETS_CPPFLAGS=$wxcppflags
+		CPPFLAGS_WXWIDGETS=$wxcppflags
 
-		WXWIDGETS_LIBS=$wxlibs
+		LIBS_WXWIDGETS=$wxlibs
 
 	fi
 
@@ -7664,30 +8076,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 +8111,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 <iconv.h>
+
+				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 +8159,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 +8217,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 +8910,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;;