···1diff --git a/tests/optional.test b/tests/optional.test
2+index 77354cc..6cc7c12 100644
3--- a/tests/optional.test
4+++ b/tests/optional.test
5+@@ -1,10 +1,5 @@
6+ # See tests/jq.test and the jq manual for more information.
078+-# Regression test for #3276 (fails on mingw/WIN32)
9-fromdate
10-"2038-01-19T03:14:08Z"
11-2147483648
···1diff --git a/configure.ac b/configure.ac
2-index 1b3ded6..0b78e69 100644
3--- a/configure.ac
4+++ b/configure.ac
5-@@ -358,6 +358,8 @@ if test "$pinentry_tty" = "yes"; then
000000006 [The TTY version of Pinentry is to be build])
7 fi
89+AM_GNU_GETTEXT_VERSION([0.21])
10+AM_GNU_GETTEXT([external])
01112 dnl
13 dnl Additional checks pinentry Curses.
0000000
···1diff --git a/configure.ac b/configure.ac
2+index 2a9f5d2..a3d9b79 100644
3--- a/configure.ac
4+++ b/configure.ac
5+@@ -45,6 +45,7 @@ m4_esyscmd([echo ]mym4_version[>VERSION])
6+7+ AC_INIT([mym4_package],[mym4_version],[https://bugs.gnupg.org])
8+9++AC_CONFIG_MACRO_DIRS([m4])
10+ AC_CONFIG_AUX_DIR([build-aux])
11+ AC_CONFIG_HEADERS([config.h])
12+ AC_CONFIG_SRCDIR(pinentry/pinentry.h)
13+@@ -329,13 +330,15 @@ if test "$pinentry_tty" = "yes"; then
14 [The TTY version of Pinentry is to be build])
15 fi
1617+AM_GNU_GETTEXT_VERSION([0.21])
18+AM_GNU_GETTEXT([external])
19++AM_ICONV
2021 dnl
22 dnl Additional checks pinentry Curses.
23+ dnl
24+ if test "$pinentry_curses" = "yes" \
25+ -o "$fallback_curses" = "yes" ; then
26+- AM_ICONV
27+ if test "$am_cv_func_iconv" != "yes"; then
28+ AC_MSG_ERROR([[
29+ ***