From: Bruno Haible Date: Sun, 5 Jan 2020 20:53:43 +0000 (+0100) Subject: build: Tweak configure.ac. X-Git-Tag: v0.21~119 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef101c09f3105be2c9bd2e262923d45c9f55e5db;p=thirdparty%2Fgettext.git build: Tweak configure.ac. * gettext-runtime/configure.ac: Move AH_BOTTOM invocation, for consistency with gettext-tools/configure.ac. --- diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac index 29f661658..48b4d5ce9 100644 --- a/gettext-runtime/configure.ac +++ b/gettext-runtime/configure.ac @@ -1,5 +1,5 @@ dnl Configuration for the gettext-runtime directory of GNU gettext -dnl Copyright (C) 1995-2010, 2012-2015, 2018-2019 Free Software Foundation, Inc. +dnl Copyright (C) 1995-2010, 2012-2015, 2018-2020 Free Software Foundation, Inc. dnl dnl This program is free software: you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by @@ -110,21 +110,6 @@ gl_INIT AC_TYPE_SIZE_T AC_CHECK_FUNCS([setlocale]) -dnl Put some default definitions into config.h. -AH_BOTTOM([ -/* On Windows, variables that may be in a DLL must be marked specially. */ -#if (defined _MSC_VER && defined _DLL) && !defined IN_RELOCWRAPPER -# define DLL_VARIABLE __declspec (dllimport) -#else -# define DLL_VARIABLE -#endif - -/* Extra OS/2 (emx+gcc) defines. */ -#if defined __EMX__ && !defined __KLIBC__ -# include "intl/os2compat.h" -#endif -]) - dnl Compilation on mingw and Cygwin needs special Makefile rules, because dnl 1. when we install a shared library, we must arrange to export dnl auxiliary pointer variables for every exported variable, @@ -154,6 +139,21 @@ if test "$USER_LABEL_PREFIX" = _; then fi AC_SUBST([INTL_EXPORTS_FLAGS]) +dnl Put some default definitions into config.h. +AH_BOTTOM([ +/* On Windows, variables that may be in a DLL must be marked specially. */ +#if (defined _MSC_VER && defined _DLL) && !defined IN_RELOCWRAPPER +# define DLL_VARIABLE __declspec (dllimport) +#else +# define DLL_VARIABLE +#endif + +/* Extra OS/2 (emx+gcc) defines. */ +#if defined __EMX__ && !defined __KLIBC__ +# include "intl/os2compat.h" +#endif +]) + dnl Check for tools needed for formatting the documentation. ac_aux_dir_abs=`cd $ac_aux_dir && pwd` AC_PATH_PROG([PERL], [perl], [$ac_aux_dir_abs/missing perl])