--- nono/configure.ac	2026/04/29 17:05:15	1.1.1.12
+++ nono/configure.ac	2026/04/29 17:05:26	1.1.1.15
@@ -69,6 +69,8 @@ ADD_CC_WARN_IF(-Wshadow-local)
 if test x"${cc_has_Wshadow_local}" != xyes; then
 	ADD_CC_WARN_IF(-Wshadow)
 fi
+ADD_CC_WARN_IF(-Wstring-conversion)
+ADD_CC_WARN_IF(-Wtype-limits)
 AC_LANG_POP([C])
 AC_SUBST([WARNFLAGS_C])
 
@@ -88,8 +90,8 @@ AC_DEFUN([ADD_CXX_WARN_IF],[
 ])
 ADD_CXX_WARN_IF(-Wcast-qual)
 ADD_CXX_WARN_IF(-Wextra-semi)
-ADD_CXX_WARN_IF(-Winconsistent-missing-override)
 ADD_CXX_WARN_IF(-Winconsistent-missing-destructor-override)
+ADD_CXX_WARN_IF(-Winconsistent-missing-override)
 ADD_CXX_WARN_IF(-Wlogical-op)
 ADD_CXX_WARN_IF(-Wmissing-prototypes)
 ADD_CXX_WARN_IF(-Wmissing-variable-declarations)
@@ -98,10 +100,79 @@ ADD_CXX_WARN_IF(-Wshadow-local)
 if test x"${cxx_has_Wshadow_local}" != xyes; then
 	ADD_CXX_WARN_IF(-Wshadow)
 fi
+ADD_CXX_WARN_IF(-Wstring-conversion)
+ADD_CXX_WARN_IF(-Wsuggest-destructor-override)
 ADD_CXX_WARN_IF(-Wsuggest-override)
+ADD_CXX_WARN_IF(-Wtype-limits)
 ADD_CXX_WARN_IF(-Wvla-extension)
 AC_SUBST([WARNFLAGS_CXX])
 
+# コンパイラが AVX2 をサポートしているか。
+AC_ARG_ENABLE([avx2],
+	[AS_HELP_STRING([--disable-avx2], [disable avx2 support])],
+	[],
+	[enable_avx2=yes])
+
+AS_IF([test x"${enable_avx2}" != x"no"], [
+	AC_MSG_CHECKING(whether the compiler supports AVX2)
+	if test x"${host_cpu}" = x"x86_64"; then
+		if test x"${host_cpu}" = x"${build_cpu}"; then
+			old_CXXFLAGS="${CXXFLAGS}"
+			CXXFLAGS="${CXXFLAGS} -mavx2"
+			AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+					#include <x86intrin.h>
+				], [
+					#if !defined(__AVX2__)
+					#error __AVX2__ is not defined by the compiler.
+					#endif
+					__m256i v;
+				])], [
+					have_avx2=yes
+				])
+			CXXFLAGS="${old_CXXFLAGS}"
+		fi
+	fi
+	if test x"${have_avx2}" = x"yes"; then
+		AC_MSG_RESULT([yes])
+		AC_DEFINE([HAVE_AVX2])
+		AC_SUBST(HOST_HAS_AVX2, yes)
+	else
+		AC_MSG_RESULT([no])
+	fi
+], [
+])
+
+# コンパイラが NEON をサポートしているか。
+AC_ARG_ENABLE([neon],
+	[AS_HELP_STRING([--disable-neon], [disable NEON support])],
+	[],
+	[enable_neon=yes])
+
+AS_IF([test x"${enable_neon}" != x"no"], [
+	AC_MSG_CHECKING(whether the compiler supports NEON)
+	if test x"${host_cpu}" = x"aarch64"; then
+		if test x"${host_cpu}" = x"${build_cpu}"; then
+			old_CXXFLAGS="${CXXFLAGS}"
+			AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+				#include <arm_neon.h>
+			], [
+				uint8x16_t v;
+			])], [
+				have_neon=yes
+			])
+			CXXFLAGS="${old_CXXFLAGS}"
+		fi
+	fi
+	if test x"${have_neon}" = x"yes"; then
+		AC_MSG_RESULT([yes])
+		AC_DEFINE([HAVE_NEON])
+		AC_SUBST(HOST_HAS_NEON, yes)
+	else
+		AC_MSG_RESULT([no])
+	fi
+], [
+])
+
 # Checks for libraries.
 
 # Checks for header files.
@@ -109,9 +180,10 @@ AC_CHECK_HEADERS([bsd/bsd.h])
 AC_CHECK_HEADERS([bsd/stdio.h])
 AC_CHECK_HEADERS([byteswap.h])
 AC_CHECK_HEADERS([endian.h])
-AC_CHECK_HEADERS([histedit.h])
 AC_CHECK_HEADERS([kqueue/sys/event.h])
 AC_CHECK_HEADERS([pthread_np.h])
+AC_CHECK_HEADERS([sched.h])
+AC_CHECK_HEADERS([sys/cpuset.h])
 AC_CHECK_HEADERS([sys/endian.h])
 AC_CHECK_HEADERS([sys/event.h])
 AC_CHECK_HEADERS([net/bpf.h])
@@ -143,6 +215,55 @@ AC_CHECK_HEADER_STDBOOL
 #AC_TYPE_UINT64_T
 #AC_TYPE_UINT8_T
 
+AC_MSG_CHECKING(for cpuset_t)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+		#if defined(HAVE_SCHED_H)
+		#include <sched.h>
+		#endif
+		#if defined(HAVE_SYS_CPUSET_H)
+		#include <sys/cpuset.h>
+		#endif
+	]], [[
+		cpuset_t set;
+	]])], [
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_CPUSET_T)
+	], [
+		AC_MSG_RESULT(no)
+	])
+
+AC_MSG_CHECKING(for cpuset_t *)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+		#if defined(HAVE_SCHED_H)
+		#include <sched.h>
+		#endif
+		#if defined(HAVE_SYS_CPUSET_H)
+		#include <sys/cpuset.h>
+		#endif
+	]], [[
+		cpuset_t *set;
+	]])], [
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_CPUSET_T_P)
+	], [
+		AC_MSG_RESULT(no)
+	])
+
+AC_MSG_CHECKING(for cpu_set_t)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+		#include <sched.h>
+	]], [[
+		cpu_set_t set;
+	]])], [
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_CPU_SET_T)
+	], [
+		AC_MSG_RESULT(no)
+	])
+
+
+# __builtin
+
 AC_MSG_CHECKING(for __builtin_assume)
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
 	[[
@@ -154,6 +275,17 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
 		AC_MSG_RESULT(no)
 	])
 
+AC_MSG_CHECKING(for __builtin_bitreverse8)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
+	[[
+		return __builtin_bitreverse8(1);
+	]])], [
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE___BUILTIN_BITREVERSE8)
+	], [
+		AC_MSG_RESULT(no)
+	])
+
 AC_MSG_CHECKING(for __builtin_bswap16)
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
 	[[
@@ -197,6 +329,28 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
 		AC_MSG_RESULT(no)
 	])
 
+AC_MSG_CHECKING(for __builtin_rotateleft32)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
+	[[
+		return __builtin_rotateleft32(1, 1);
+	]])], [
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE___BUILTIN_ROTATELEFT32)
+	], [
+		AC_MSG_RESULT(no)
+	])
+
+AC_MSG_CHECKING(for __builtin_rotateright32)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
+	[[
+		return __builtin_rotateright32(1, 1);
+	]])], [
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE___BUILTIN_ROTATERIGHT32)
+	], [
+		AC_MSG_RESULT(no)
+	])
+
 AC_MSG_CHECKING(for __builtin_unreachable)
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
 		__builtin_unreachable();
@@ -438,6 +592,192 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
 		AC_MSG_RESULT([no])
 	])
 
+AC_MSG_CHECKING(for CPU_COUNT)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+		#if defined(HAVE_SCHED_H)
+		#include <sched.h>
+		#endif
+		#if defined(HAVE_SYS_CPUSET_H)
+		#include <sys/cpuset.h>
+		#endif
+	], [
+		#if defined(HAVE_CPUSET_T)
+		cpuset_t set;
+		#elif defined(HAVE_CPU_SET_T)
+		cpu_set_t set;
+		#endif
+		CPU_COUNT(&set);
+	])], [
+		AC_MSG_RESULT([yes])
+		AC_DEFINE([HAVE_CPU_COUNT])
+	], [
+		AC_MSG_RESULT([no])
+	])
+
+AC_MSG_CHECKING(for CPU_ISSET)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+		#if defined(HAVE_SCHED_H)
+		#include <sched.h>
+		#endif
+		#if defined(HAVE_SYS_CPUSET_H)
+		#include <sys/cpuset.h>
+		#endif
+	], [
+		#if defined(HAVE_CPUSET_T)
+		cpuset_t set;
+		#elif defined(HAVE_CPU_SET_T)
+		cpu_set_t set;
+		#endif
+		CPU_ISSET(0, &set);
+	])], [
+		AC_MSG_RESULT([yes])
+		AC_DEFINE([HAVE_CPU_ISSET])
+	], [
+		AC_MSG_RESULT([no])
+	])
+
+AC_MSG_CHECKING(for CPU_SET)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+		#if defined(HAVE_SCHED_H)
+		#include <sched.h>
+		#endif
+		#if defined(HAVE_SYS_CPUSET_H)
+		#include <sys/cpuset.h>
+		#endif
+	], [
+		#if defined(HAVE_CPUSET_T)
+		cpuset_t set;
+		#elif defined(HAVE_CPU_SET_T)
+		cpu_set_t set;
+		#endif
+		CPU_SET(0, &set);
+	])], [
+		AC_MSG_RESULT([yes])
+		AC_DEFINE([HAVE_CPU_SET])
+	], [
+		AC_MSG_RESULT([no])
+	])
+
+AC_MSG_CHECKING(for CPU_ZERO)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+		#if defined(HAVE_SCHED_H)
+		#include <sched.h>
+		#endif
+		#if defined(HAVE_SYS_CPUSET_H)
+		#include <sys/cpuset.h>
+		#endif
+	], [
+		#if defined(HAVE_CPUSET_T)
+		cpuset_t set;
+		#elif defined(HAVE_CPU_SET_T)
+		cpu_set_t set;
+		#endif
+		CPU_ZERO(&set);
+	])], [
+		AC_MSG_RESULT([yes])
+		AC_DEFINE([HAVE_CPU_ZERO])
+	], [
+		AC_MSG_RESULT([no])
+	])
+
+AC_MSG_CHECKING(for cpuset_create)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+		#include <sched.h>
+	], [
+		cpuset_create();
+	])], [
+		AC_MSG_RESULT([yes])
+		AC_DEFINE([HAVE_CPUSET_CREATE])
+	], [
+		AC_MSG_RESULT([no])
+	])
+
+AC_MSG_CHECKING(for cpuset_isset)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+		#include <sched.h>
+	], [
+		cpuset_isset(0, NULL);
+	])], [
+		AC_MSG_RESULT([yes])
+		AC_DEFINE([HAVE_CPUSET_ISSET])
+	], [
+		AC_MSG_RESULT([no])
+	])
+
+AC_MSG_CHECKING(for cpuset_set)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+		#include <sched.h>
+	], [
+		cpuset_set(0, NULL);
+	])], [
+		AC_MSG_RESULT([yes])
+		AC_DEFINE([HAVE_CPUSET_SET])
+	], [
+		AC_MSG_RESULT([no])
+	])
+
+AC_MSG_CHECKING(for cpuset_size)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+		#include <sched.h>
+	], [
+		cpuset_size(NULL);
+	])], [
+		AC_MSG_RESULT([yes])
+		AC_DEFINE([HAVE_CPUSET_SIZE])
+	], [
+		AC_MSG_RESULT([no])
+	])
+
+AC_MSG_CHECKING(for statfs)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+		#include <sys/statfs.h>
+	], [
+		struct statfs buf;
+		statfs("", &buf);
+	])], [
+		AC_MSG_RESULT([yes])
+		AC_DEFINE([HAVE_STATFS])
+		have_statxxfs=statfs
+	], [
+		AC_MSG_RESULT([no])
+	])
+
+AC_MSG_CHECKING(for statvfs)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+		#include <sys/statvfs.h>
+	], [
+		struct statvfs buf;
+		statvfs("", &buf);
+	])], [
+		AC_MSG_RESULT([yes])
+		AC_DEFINE([HAVE_STATVFS])
+		have_statxxfs=statvfs
+	], [
+		AC_MSG_RESULT([no])
+	])
+
+if test -z "${have_statxxfs}"; then
+	AC_MSG_FAILURE([*** No statfs() nor statvfs() found])
+fi
+
+AC_CHECK_MEMBER([struct stat.st_mtimespec], [
+		AC_DEFINE([HAVE_STAT_ST_TIMESPEC])
+	], [], [
+		#include <sys/stat.h>
+	])
+
+AC_MSG_CHECKING(for timegm)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+		#include <time.h>
+	], [
+		timegm(NULL);
+	])], [
+		AC_MSG_RESULT([yes])
+	], [
+		AC_MSG_RESULT([no])
+		AC_MSG_FAILURE([*** No timegm() found])
+	])
+
 AC_MSG_CHECKING(for pthread_getname_np)
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 		#include <pthread.h>
@@ -530,19 +870,22 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 		AC_MSG_RESULT(no)
 	])
 
-AC_MSG_CHECKING(for iconv const)
+AC_MSG_CHECKING(for pthread_setaffinity_np)
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-		#include <iconv.h>
+		#include <pthread.h>
+		#if defined(HAVE_PTHREAD_NP_H)
+		#include <pthread_np.h>
+		#endif
 	]], [[
-		const char **a;
-		iconv(0, a, 0, 0, 0);
+		pthread_setaffinity_np(pthread_self(), 0, NULL);
 	]])], [
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_ICONV_CONST)
+		AC_DEFINE(HAVE_PTHREAD_SETAFFINITY_NP)
 	], [
 		AC_MSG_RESULT(no)
 	])
 
+
 #
 # Network
 #
@@ -593,6 +936,43 @@ else
 	AC_MSG_RESULT([no])
 fi
 
+#
+# Other libraries
+#
+
+# CHECK_LIB($1=name, $2=libs, $3=include, $4=src)
+AC_DEFUN([CHECK_LIB], [
+	AC_MSG_CHECKING([for $1])
+	for path in ${PATHS}; do
+		old_CPPFLAGS=${CPPFLAGS}
+		old_LIBS=${LIBS}
+		case ${path} in
+		 none)
+			LIBS="${LIBS} $2"
+			;;
+		 *)
+			CPPFLAGS="${CPPFLAGS} -I${path}/include"
+			LIBS="${LIBS} -L${path}/lib $2"
+			;;
+		esac
+		AC_LINK_IFELSE([AC_LANG_PROGRAM([$3], [$4])], [
+			has_$1=yes
+			break
+		], [
+			has_$1=no
+		])
+		CPPFLAGS=${old_CPPFLAGS}
+		LIBS=${old_LIBS}
+	done
+	if test x"${has_$1}" = x"yes"; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+	fi
+])
+
+PATHS="none /usr/pkg /usr/local"
+
 # libbsd on Linux
 AC_CHECK_LIB(c, getprogname, ,)
 AC_CHECK_LIB(bsd, getprogname,
@@ -616,11 +996,6 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
 	]
 )
 
-# libedit (editline)
-if test x"$ac_cv_header_histedit_h" = xyes; then
-	LIBS="${LIBS} -ledit -ltermcap"
-fi
-
 # libkqueue on Linux
 AC_CHECK_LIB(kqueue, kqueue,
 	LIBS="${LIBS} -lkqueue"
@@ -640,7 +1015,7 @@ AC_ARG_WITH([gui],
 
 AS_IF([test "x$with_gui" != xno], [
 	AC_MSG_CHECKING(for wx-config)
-	wxconfig_paths="${WX_CONFIG} wx-config-3.0 wx-config"
+	wxconfig_paths="${WX_CONFIG} wx-config-3.2 wx-config-3.0 wx-config"
 	wxconfig=""
 	for c in ${wxconfig_paths}; do
 		ver=`$c --version 2>&1 | cut -f 1 -d .`
@@ -650,8 +1025,8 @@ AS_IF([test "x$with_gui" != xno], [
 		fi
 	done
 	if test -z "$wxconfig"; then
-		AC_MSG_ERROR([*** wxWidgets-3.0 not found in ${wxconfig_paths}
-*** If you use pkgsrc, install x11/wxGTK30.
+		AC_MSG_ERROR([*** wxWidgets-3.2 nor -3.0 not found in ${wxconfig_paths}
+*** If you use pkgsrc, install x11/wxGTK32.
 *** If you use Ubuntu, sudo apt install libwxgtk3.0-gtk3-dev])
 	else
 		AC_MSG_RESULT([$wxconfig])
@@ -659,6 +1034,8 @@ AS_IF([test "x$with_gui" != xno], [
 		AC_MSG_CHECKING(for wxWidgets version)
 		wxversion=`$wxconfig --version`
 		AC_MSG_RESULT([$wxversion])
+		wxmajorminor=`echo $wxversion | awk -F . '{print $1 $2}'`
+		AC_SUBST([WX_MAJORMINOR], [${wxmajorminor}])
 
 		wxcppflags=`$wxconfig --cppflags`
 		wxlibs=`$wxconfig --libs`
@@ -691,9 +1068,49 @@ AS_IF([test "x$with_gui" != xno], [
 	AC_SUBST([WITH_GUI], [no])
 ])
 
+# nono 本体のチェックはここまで。
+nono_CPPFLAGS=${CPPFLAGS}
+nono_LIBS=${LIBS}
+AC_SUBST([NONO_CPPFLAGS], [${nono_CPPFLAGS}])
+AC_SUBST([NONO_LIBS], [${nono_LIBS}])
+
+# iconv は util/ でのみ必要。
+CPPFLAGS=
+LIBS=
+CHECK_LIB([libiconv], [-liconv], [
+	#include <iconv.h>
+], [
+	iconv_open("", "");
+])
+
+if test x"${has_libiconv}" = x"yes"; then
+	AC_MSG_CHECKING(whether iconv needs const)
+	old_CPPFLAGS="${CPPFLAGS}"
+	CPPFLAGS="${CPPFLAGS} -Werror"
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+			#include <iconv.h>
+		]], [[
+			const char **a;
+			iconv(0, a, 0, 0, 0);
+		]])], [
+			AC_MSG_RESULT(yes)
+			AC_DEFINE(HAVE_ICONV_CONST)
+		], [
+			AC_MSG_RESULT(no)
+		])
+	CPPFLAGS="${old_CPPFLAGS}"
+fi
+
+iconv_CPPFLAGS=${CPPFLAGS}
+iconv_LIBS=${LIBS}
+AC_SUBST([ICONV_CPPFLAGS], [${iconv_CPPFLAGS}])
+AC_SUBST([ICONV_LIBS], [${iconv_LIBS}])
+
 AC_CONFIG_FILES([Makefile.cfg
 	host/Makefile
 	wx/Makefile
+	util/mkcgrom/Makefile
+	util/ttfext/Makefile
 	util/viewcgrom/Makefile
 ])
 AC_CONFIG_HEADERS([config-nono.h])