[BACK]Return to gnulib-common.m4 CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / libiconv / srcm4

Diff for /embedaddon/libiconv/srcm4/gnulib-common.m4 between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2012/05/29 09:29:44 version 1.1.1.3, 2021/03/17 13:38:46
Line 1 Line 1
# gnulib-common.m4 serial 29# gnulib-common.m4 serial 44
dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.dnl Copyright (C) 2007-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation  dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,  dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.  dnl with or without modifications, as long as this notice is preserved.
   
   AC_PREREQ([2.62])
   
 # gl_COMMON  # gl_COMMON
 # is expanded unconditionally through gnulib-tool magic.  # is expanded unconditionally through gnulib-tool magic.
 AC_DEFUN([gl_COMMON], [  AC_DEFUN([gl_COMMON], [
Line 13  AC_DEFUN([gl_COMMON], [ Line 15  AC_DEFUN([gl_COMMON], [
 ])  ])
 AC_DEFUN([gl_COMMON_BODY], [  AC_DEFUN([gl_COMMON_BODY], [
   AH_VERBATIM([_Noreturn],    AH_VERBATIM([_Noreturn],
[/* The _Noreturn keyword of draft C1X.  */[/* The _Noreturn keyword of C11.  */
 #ifndef _Noreturn  #ifndef _Noreturn
# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \# if (defined __cplusplus \
      || 0x5110 <= __SUNPRO_C)      && ((201103 <= __cplusplus && !(__GNUC__ == 4 && __GNUC_MINOR__ == 7)) \
           || (defined _MSC_VER && 1900 <= _MSC_VER)))
 #  define _Noreturn [[noreturn]]
 # elif ((!defined __cplusplus || defined __clang__) \
         && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0)  \
             || 4 < __GNUC__ + (7 <= __GNUC_MINOR__)))
    /* _Noreturn works as-is.  */
 # elif 2 < __GNUC__ + (8 <= __GNUC_MINOR__) || 0x5110 <= __SUNPRO_C
 #  define _Noreturn __attribute__ ((__noreturn__))  #  define _Noreturn __attribute__ ((__noreturn__))
# elif 1200 <= _MSC_VER# elif 1200 <= (defined _MSC_VER ? _MSC_VER : 0)
 #  define _Noreturn __declspec (noreturn)  #  define _Noreturn __declspec (noreturn)
 # else  # else
 #  define _Noreturn  #  define _Noreturn
Line 29  AC_DEFUN([gl_COMMON_BODY], [ Line 38  AC_DEFUN([gl_COMMON_BODY], [
 [/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports  [/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
    the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of     the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
    earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.     earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
   __APPLE__ && __MACH__ test for MacOS X.   __APPLE__ && __MACH__ test for Mac OS X.
    __APPLE_CC__ tests for the Apple compiler and its version.     __APPLE_CC__ tests for the Apple compiler and its version.
    __STDC_VERSION__ tests for the C99 mode.  */     __STDC_VERSION__ tests for the C99 mode.  */
 #if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__  #if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
Line 48  AC_DEFUN([gl_COMMON_BODY], [ Line 57  AC_DEFUN([gl_COMMON_BODY], [
    is a misnomer outside of parameter lists.  */     is a misnomer outside of parameter lists.  */
 #define _UNUSED_PARAMETER_ _GL_UNUSED  #define _UNUSED_PARAMETER_ _GL_UNUSED
   
   /* gcc supports the "unused" attribute on possibly unused labels, and
      g++ has since version 4.5.  Note to support C++ as well as C,
      _GL_UNUSED_LABEL should be used with a trailing ;  */
   #if !defined __cplusplus || __GNUC__ > 4 \
       || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
   # define _GL_UNUSED_LABEL _GL_UNUSED
   #else
   # define _GL_UNUSED_LABEL
   #endif
   
 /* The __pure__ attribute was added in gcc 2.96.  */  /* The __pure__ attribute was added in gcc 2.96.  */
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)  #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
 # define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))  # define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
Line 61  AC_DEFUN([gl_COMMON_BODY], [ Line 80  AC_DEFUN([gl_COMMON_BODY], [
 #else  #else
 # define _GL_ATTRIBUTE_CONST /* empty */  # define _GL_ATTRIBUTE_CONST /* empty */
 #endif  #endif
   
   /* The __malloc__ attribute was added in gcc 3.  */
   #if 3 <= __GNUC__
   # define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__))
   #else
   # define _GL_ATTRIBUTE_MALLOC /* empty */
   #endif
 ])  ])
     AH_VERBATIM([async_safe],
   [/* The _GL_ASYNC_SAFE marker should be attached to functions that are
      signal handlers (for signals other than SIGABRT, SIGPIPE) or can be
      invoked from such signal handlers.  Such functions have some restrictions:
        * All functions that it calls should be marked _GL_ASYNC_SAFE as well,
          or should be listed as async-signal-safe in POSIX
          <http://pubs.opengroup.org/onlinepubs/9699919799/functions/V2_chap02.html#tag_15_04>
          section 2.4.3.  Note that malloc(), sprintf(), and fwrite(), in
          particular, are NOT async-signal-safe.
        * All memory locations (variables and struct fields) that these functions
          access must be marked 'volatile'.  This holds for both read and write
          accesses.  Otherwise the compiler might optimize away stores to and
          reads from such locations that occur in the program, depending on its
          data flow analysis.  For example, when the program contains a loop
          that is intended to inspect a variable set from within a signal handler
              while (!signal_occurred)
                ;
          the compiler is allowed to transform this into an endless loop if the
          variable 'signal_occurred' is not declared 'volatile'.
      Additionally, recall that:
        * A signal handler should not modify errno (except if it is a handler
          for a fatal signal and ends by raising the same signal again, thus
          provoking the termination of the process).  If it invokes a function
          that may clobber errno, it needs to save and restore the value of
          errno.  */
   #define _GL_ASYNC_SAFE
   ])
   dnl Preparation for running test programs:    dnl Preparation for running test programs:
   dnl Tell glibc to write diagnostics from -D_FORTIFY_SOURCE=2 to stderr, not    dnl Tell glibc to write diagnostics from -D_FORTIFY_SOURCE=2 to stderr, not
   dnl to /dev/tty, so they can be redirected to log files.  Such diagnostics    dnl to /dev/tty, so they can be redirected to log files.  Such diagnostics
Line 196  AC_DEFUN([gl_FEATURES_H], Line 249  AC_DEFUN([gl_FEATURES_H],
   AC_SUBST([HAVE_FEATURES_H])    AC_SUBST([HAVE_FEATURES_H])
 ])  ])
   
 # m4_foreach_w  
 # is a backport of autoconf-2.59c's m4_foreach_w.  
 # Remove this macro when we can assume autoconf >= 2.60.  
 m4_ifndef([m4_foreach_w],  
   [m4_define([m4_foreach_w],  
     [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])])  
   
 # AS_VAR_IF(VAR, VALUE, [IF-MATCH], [IF-NOT-MATCH])  # AS_VAR_IF(VAR, VALUE, [IF-MATCH], [IF-NOT-MATCH])
 # ----------------------------------------------------  # ----------------------------------------------------
 # Backport of autoconf-2.63b's macro.  # Backport of autoconf-2.63b's macro.
Line 211  m4_ifndef([AS_VAR_IF], Line 257  m4_ifndef([AS_VAR_IF],
 [m4_define([AS_VAR_IF],  [m4_define([AS_VAR_IF],
 [AS_IF([test x"AS_VAR_GET([$1])" = x""$2], [$3], [$4])])])  [AS_IF([test x"AS_VAR_GET([$1])" = x""$2], [$3], [$4])])])
   
   # gl_PROG_CC_C99
   # Modifies the value of the shell variable CC in an attempt to make $CC
   # understand ISO C99 source code.
   # This is like AC_PROG_CC_C99, except that
   # - AC_PROG_CC_C99 does not mix well with AC_PROG_CC_STDC
   #   <https://lists.gnu.org/r/bug-gnulib/2011-09/msg00367.html>,
   #   but many more packages use AC_PROG_CC_STDC than AC_PROG_CC_C99
   #   <https://lists.gnu.org/r/bug-gnulib/2011-09/msg00441.html>.
   # Remaining problems:
   # - When AC_PROG_CC_STDC is invoked twice, it adds the C99 enabling options
   #   to CC twice
   #   <https://lists.gnu.org/r/bug-gnulib/2011-09/msg00431.html>.
   # - AC_PROG_CC_STDC is likely to change now that C11 is an ISO standard.
   AC_DEFUN([gl_PROG_CC_C99],
   [
     dnl Change that version number to the minimum Autoconf version that supports
     dnl mixing AC_PROG_CC_C99 calls with AC_PROG_CC_STDC calls.
     m4_version_prereq([9.0],
       [AC_REQUIRE([AC_PROG_CC_C99])],
       [AC_REQUIRE([AC_PROG_CC_STDC])])
   ])
   
 # gl_PROG_AR_RANLIB  # gl_PROG_AR_RANLIB
 # Determines the values for AR, ARFLAGS, RANLIB that fit with the compiler.  # Determines the values for AR, ARFLAGS, RANLIB that fit with the compiler.
   # The user can set the variables AR, ARFLAGS, RANLIB if he wants to override
   # the values.
 AC_DEFUN([gl_PROG_AR_RANLIB],  AC_DEFUN([gl_PROG_AR_RANLIB],
 [  [
   dnl Minix 3 comes with two toolchains: The Amsterdam Compiler Kit compiler    dnl Minix 3 comes with two toolchains: The Amsterdam Compiler Kit compiler
   dnl as "cc", and GCC as "gcc". They have different object file formats and    dnl as "cc", and GCC as "gcc". They have different object file formats and
  dnl library formats. In particular, the GNU binutils programs ar, ranlib  dnl library formats. In particular, the GNU binutils programs ar and ranlib
   dnl produce libraries that work only with gcc, not with cc.    dnl produce libraries that work only with gcc, not with cc.
   AC_REQUIRE([AC_PROG_CC])    AC_REQUIRE([AC_PROG_CC])
  AC_EGREP_CPP([Amsterdam],  dnl The '][' hides this use from 'aclocal'.
   AC_BEFORE([$0], [A][M_PROG_AR])
   AC_CACHE_CHECK([for Minix Amsterdam compiler], [gl_cv_c_amsterdam_compiler],
     [      [
         AC_EGREP_CPP([Amsterdam],
           [
 #ifdef __ACK__  #ifdef __ACK__
 Amsterdam  Amsterdam
 #endif  #endif
    ],        ],
    [AR='cc -c.a'        [gl_cv_c_amsterdam_compiler=yes],
     ARFLAGS='-o'        [gl_cv_c_amsterdam_compiler=no])
     RANLIB=':' 
    ], 
    [dnl Use the Automake-documented default values for AR and ARFLAGS. 
     AR='ar' 
     ARFLAGS='cru' 
     dnl Use the ranlib program if it is available. 
     AC_PROG_RANLIB 
     ])      ])
   
     dnl Don't compete with AM_PROG_AR's decision about AR/ARFLAGS if we are not
     dnl building with __ACK__.
     if test $gl_cv_c_amsterdam_compiler = yes; then
       if test -z "$AR"; then
         AR='cc -c.a'
       fi
       if test -z "$ARFLAGS"; then
         ARFLAGS='-o'
       fi
     else
       dnl AM_PROG_AR was added in automake v1.11.2.  AM_PROG_AR does not AC_SUBST
       dnl ARFLAGS variable (it is filed into Makefile.in directly by automake
       dnl script on-demand, if not specified by ./configure of course).
       dnl Don't AC_REQUIRE the AM_PROG_AR otherwise the code for __ACK__ above
       dnl will be ignored.  Also, pay attention to call AM_PROG_AR in else block
       dnl because AM_PROG_AR is written so it could re-set AR variable even for
       dnl __ACK__.  It may seem like its easier to avoid calling the macro here,
       dnl but we need to AC_SUBST both AR/ARFLAGS (thus those must have some good
       dnl default value and automake should usually know them).
       dnl
       dnl The '][' hides this use from 'aclocal'.
       m4_ifdef([A][M_PROG_AR], [A][M_PROG_AR], [:])
     fi
   
     dnl In case the code above has not helped with setting AR/ARFLAGS, use
     dnl Automake-documented default values for AR and ARFLAGS, but prefer
     dnl ${host}-ar over ar (useful for cross-compiling).
     AC_CHECK_TOOL([AR], [ar], [ar])
     if test -z "$ARFLAGS"; then
       ARFLAGS='cr'
     fi
   
   AC_SUBST([AR])    AC_SUBST([AR])
   AC_SUBST([ARFLAGS])    AC_SUBST([ARFLAGS])
     if test -z "$RANLIB"; then
       if test $gl_cv_c_amsterdam_compiler = yes; then
         RANLIB=':'
       else
         dnl Use the ranlib program if it is available.
         AC_PROG_RANLIB
       fi
     fi
     AC_SUBST([RANLIB])
 ])  ])
   
 # AC_PROG_MKDIR_P  
 # is a backport of autoconf-2.60's AC_PROG_MKDIR_P, with a fix  
 # for interoperability with automake-1.9.6 from autoconf-2.62.  
 # Remove this macro when we can assume autoconf >= 2.62 or  
 # autoconf >= 2.60 && automake >= 1.10.  
 m4_ifdef([AC_PROG_MKDIR_P], [  
   dnl For automake-1.9.6 && autoconf < 2.62: Ensure MKDIR_P is AC_SUBSTed.  
   m4_define([AC_PROG_MKDIR_P],  
     m4_defn([AC_PROG_MKDIR_P])[  
     AC_SUBST([MKDIR_P])])], [  
   dnl For autoconf < 2.60: Backport of AC_PROG_MKDIR_P.  
   AC_DEFUN_ONCE([AC_PROG_MKDIR_P],  
     [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake  
      MKDIR_P='$(mkdir_p)'  
      AC_SUBST([MKDIR_P])])])  
   
 # AC_C_RESTRICT  # AC_C_RESTRICT
# This definition overrides the AC_C_RESTRICT macro from autoconf 2.60..2.61,# This definition is copied from post-2.69 Autoconf and overrides the
# so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++# AC_C_RESTRICT macro from autoconf 2.60..2.69.  It can be removed
# works.# once autoconf >= 2.70 can be assumed.  It's painful to check version
# This definition can be removed once autoconf >= 2.62 can be assumed.# numbers, and in practice this macro is more up-to-date than Autoconf
m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.62]),[-1],[# is, so override Autoconf unconditionally.
 AC_DEFUN([AC_C_RESTRICT],  AC_DEFUN([AC_C_RESTRICT],
 [AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict],  [AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict],
   [ac_cv_c_restrict=no    [ac_cv_c_restrict=no
    # The order here caters to the fact that C++ does not require restrict.     # The order here caters to the fact that C++ does not require restrict.
    for ac_kw in __restrict __restrict__ _Restrict restrict; do     for ac_kw in __restrict __restrict__ _Restrict restrict; do
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM(     AC_COMPILE_IFELSE(
      [[typedef int * int_ptr;      [AC_LANG_PROGRAM(
        int foo (int_ptr $ac_kw ip) {         [[typedef int *int_ptr;
        return ip[0];           int foo (int_ptr $ac_kw ip) { return ip[0]; }
       }]],           int bar (int [$ac_kw]); /* Catch GCC bug 14050.  */
      [[int s[1];           int bar (int ip[$ac_kw]) { return ip[0]; }
        int * $ac_kw t = s;         ]],
        t[0] = 0;         [[int s[1];
        return foo(t)]])],           int *$ac_kw t = s;
            t[0] = 0;
            return foo (t) + bar (t);
          ]])],
       [ac_cv_c_restrict=$ac_kw])        [ac_cv_c_restrict=$ac_kw])
      test "$ac_cv_c_restrict" != no && break       test "$ac_cv_c_restrict" != no && break
    done     done
Line 285  AC_DEFUN([AC_C_RESTRICT], Line 381  AC_DEFUN([AC_C_RESTRICT],
    nothing if this is not supported.  Do not define if restrict is     nothing if this is not supported.  Do not define if restrict is
    supported directly.  */     supported directly.  */
 #undef restrict  #undef restrict
/* Work around a bug in Sun C++: it does not support _Restrict, even/* Work around a bug in Sun C++: it does not support _Restrict or
   though the corresponding Sun C compiler does, which causes   __restrict__, even though the corresponding Sun C compiler ends up with
   "#define restrict _Restrict" in the previous line.  Perhaps some future   "#define restrict _Restrict" or "#define restrict __restrict__" in the
   version of Sun C++ will work with _Restrict; if so, it'll probably   previous line.  Perhaps some future version of Sun C++ will work with
   define __RESTRICT, just as Sun C does.  */   restrict; if so, hopefully it defines __RESTRICT like Sun C does.  */
 #if defined __SUNPRO_CC && !defined __RESTRICT  #if defined __SUNPRO_CC && !defined __RESTRICT
 # define _Restrict  # define _Restrict
   # define __restrict__
 #endif])  #endif])
  case $ac_cv_c_restrict in   case $ac_cv_c_restrict in
    restrict) ;;     restrict) ;;
    no) AC_DEFINE([restrict], []) ;;     no) AC_DEFINE([restrict], []) ;;
    *)  AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;;     *)  AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;;
  esac   esac
])])# AC_C_RESTRICT
]) 
   
 # gl_BIGENDIAN  # gl_BIGENDIAN
 # is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd.  # is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd.
Line 322  AC_DEFUN([gl_CACHE_VAL_SILENT], Line 418  AC_DEFUN([gl_CACHE_VAL_SILENT],
   AC_CACHE_VAL([$1], [$2])    AC_CACHE_VAL([$1], [$2])
   as_echo_n="$saved_as_echo_n"    as_echo_n="$saved_as_echo_n"
 ])  ])
   
   # AS_VAR_COPY was added in autoconf 2.63b
   m4_define_default([AS_VAR_COPY],
   [AS_LITERAL_IF([$1[]$2], [$1=$$2], [eval $1=\$$2])])
Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>