From 880c55840259c9fbee26a2116d50a287f22a2c99 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 24 Feb 2022 05:28:01 +0200 Subject: [PATCH 45/46] Add configure option --without-iconv See osdn #43572 Signed-off-by: Marko Lindqvist --- configure.ac | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 65e2363338..530decde42 100644 --- a/configure.ac +++ b/configure.ac @@ -363,10 +363,16 @@ fi AC_ARG_WITH([readline], AS_HELP_STRING([--with-readline], [support fancy command line editing]), -WITH_READLINE=$withval, dnl yes/no - required to use / never use -WITH_READLINE="maybe" dnl maybe - use if found [default] +[WITH_READLINE=$withval], dnl yes/no - required to use / never use +[WITH_READLINE="maybe"] dnl maybe - use if found [default] ) +AC_ARG_WITH([iconv], + AS_HELP_STRING([--without-iconv], [disable check for iconv]), +[if test x$withval = xno ; then + iconv_disabled=true +fi]) + FOLLOWTAG=${DEFAULT_FOLLOW_TAG} AC_ARG_WITH([followtag], AS_HELP_STRING([--with-followtag], [version tag to follow]), @@ -640,14 +646,16 @@ AC_PROG_MAKE_SET dnl Check for libiconv (which is usually included in glibc, but may be dnl distributed separately). The libcharset check must come after the dnl iconv check. This whole thing must come before the gettext check below. -AM_ICONV -FC_LIBCHARSET -AM_LANGINFO_CODESET -if test "$am_cv_func_iconv" != yes; then - AC_MSG_ERROR([Iconv is missing. You can get libiconv from http://gnu.org/, \ +if test "x$iconv_disabled" != "xtrue" ; then + AM_ICONV + FC_LIBCHARSET + AM_LANGINFO_CODESET + if test "$am_cv_func_iconv" != yes; then + AC_MSG_ERROR([Iconv is missing. You can get libiconv from http://gnu.org/, \ or try using --with-libiconv-prefix.]) + fi + LIBS="$LIBS $LIBICONV" fi -LIBS="$LIBS $LIBICONV" dnl I18n support ALL_LINGUAS="ar bg cs ca da de el en_GB eo es et fa fi fr ga gd he hu id it ja -- 2.34.1