--- embedaddon/libiconv/configure.ac 2012/05/29 09:29:42 1.1.1.2 +++ embedaddon/libiconv/configure.ac 2021/03/17 13:38:46 1.1.1.3 @@ -1,4 +1,4 @@ -dnl Copyright (C) 1999-2011 Free Software Foundation, Inc. +dnl Copyright (C) 1999-2011, 2016, 2018-2019 Free Software Foundation, Inc. dnl This file is part of the GNU LIBICONV Library. dnl dnl The GNU LIBICONV Library is free software; you can redistribute it @@ -13,14 +13,13 @@ dnl Library General Public License for more details. dnl dnl You should have received a copy of the GNU Library General Public dnl License along with the GNU LIBICONV Library; see the file COPYING.LIB. -dnl If not, write to the Free Software Foundation, Inc., 51 Franklin Street, -dnl Fifth Floor, Boston, MA 02110-1301, USA. +dnl If not, see . -AC_PREREQ([2.60]) -AC_INIT +AC_PREREQ([2.63]) +AC_INIT([libiconv], [1.16]) AC_CONFIG_SRCDIR([lib/iconv.c]) AC_CONFIG_AUX_DIR([build-aux]) -AM_INIT_AUTOMAKE([libiconv], [1.14]) +AM_INIT_AUTOMAKE AC_CONFIG_HEADERS([config.h lib/config.h]) AC_PROG_MAKE_SET @@ -51,9 +50,10 @@ dnl checks for UNIX variants that set DEFS gl_EARLY -dnl checks for installer options +dnl checks for build configuration -gl_RELOCATABLE([srclib]) +LT_INIT([disable-static win32-dll]) +gl_RELOCATABLE AC_ARG_ENABLE([extra-encodings], [AC_HELP_STRING([--enable-extra-encodings], @@ -75,10 +75,8 @@ dnl checks for compiler output filename suff AC_OBJEXT AC_EXEEXT -dnl check for build configuration +dnl checks for build configuration -LT_INIT([disable-static win32-dll]) - dnl Prepares the libtool configuration for handling of Windows resources, and dnl sets the RC variable to a program that compiles Windows resource files. LT_LANG([Windows Resource]) @@ -199,7 +197,6 @@ AH_BOTTOM([ ]) AC_CONFIG_SUBDIRS([libcharset]) -AC_CONFIG_SUBDIRS([preload]) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([lib/Makefile]) AC_CONFIG_FILES([srclib/Makefile])