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

Diff for /embedaddon/libiconv/srcm4/include_next.m4 between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 22:57:49 version 1.1.1.2, 2012/05/29 09:29:44
Line 1 Line 1
# include_next.m4 serial 14# include_next.m4 serial 20
dnl Copyright (C) 2006-2009 Free Software Foundation, Inc.dnl Copyright (C) 2006-2011 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.
Line 24  dnl does not warn about some things, and on some syste Line 24  dnl does not warn about some things, and on some syste
 dnl __STDC__ evaluates to 0 instead of to 1. The latter is an undesired side  dnl __STDC__ evaluates to 0 instead of to 1. The latter is an undesired side
 dnl effect; we are therefore careful to use 'defined __STDC__' or '1' instead  dnl effect; we are therefore careful to use 'defined __STDC__' or '1' instead
 dnl of plain '__STDC__'.  dnl of plain '__STDC__'.
   dnl
   dnl PRAGMA_COLUMNS can be used in files that override system header files, so
   dnl as to avoid compilation errors on HP NonStop systems when the gnulib file
   dnl is included by a system header file that does a "#pragma COLUMNS 80" (which
   dnl has the effect of truncating the lines of that file and all files that it
   dnl includes to 80 columns) and the gnulib file has lines longer than 80
   dnl columns.
   
 AC_DEFUN([gl_INCLUDE_NEXT],  AC_DEFUN([gl_INCLUDE_NEXT],
 [  [
Line 68  EOF Line 75  EOF
 EOF  EOF
      gl_save_CPPFLAGS="$CPPFLAGS"       gl_save_CPPFLAGS="$CPPFLAGS"
      CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2"       CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2"
     AC_COMPILE_IFELSE([#include <conftest.h>],dnl We intentionally avoid using AC_LANG_SOURCE here.
      AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED[#include <conftest.h>]],
        [gl_cv_have_include_next=yes],         [gl_cv_have_include_next=yes],
        [CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2"         [CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2"
        AC_COMPILE_IFELSE([#include <conftest.h>],        AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED[#include <conftest.h>]],
           [gl_cv_have_include_next=buggy],            [gl_cv_have_include_next=buggy],
           [gl_cv_have_include_next=no])            [gl_cv_have_include_next=no])
        ])         ])
Line 97  EOF Line 105  EOF
   AC_SUBST([INCLUDE_NEXT])    AC_SUBST([INCLUDE_NEXT])
   AC_SUBST([INCLUDE_NEXT_AS_FIRST_DIRECTIVE])    AC_SUBST([INCLUDE_NEXT_AS_FIRST_DIRECTIVE])
   AC_SUBST([PRAGMA_SYSTEM_HEADER])    AC_SUBST([PRAGMA_SYSTEM_HEADER])
     AC_CACHE_CHECK([whether system header files limit the line length],
       [gl_cv_pragma_columns],
       [dnl HP NonStop systems, which define __TANDEM, have this misfeature.
        AC_EGREP_CPP([choke me],
          [
   #ifdef __TANDEM
   choke me
   #endif
          ],
          [gl_cv_pragma_columns=yes],
          [gl_cv_pragma_columns=no])
       ])
     if test $gl_cv_pragma_columns = yes; then
       PRAGMA_COLUMNS="#pragma COLUMNS 10000"
     else
       PRAGMA_COLUMNS=
     fi
     AC_SUBST([PRAGMA_COLUMNS])
 ])  ])
   
 # gl_CHECK_NEXT_HEADERS(HEADER1 HEADER2 ...)  # gl_CHECK_NEXT_HEADERS(HEADER1 HEADER2 ...)
Line 109  EOF Line 135  EOF
 # be  # be
 # '"///usr/include/foo.h"', or whatever other absolute file name is suitable.  # '"///usr/include/foo.h"', or whatever other absolute file name is suitable.
 # That way, a header file with the following line:  # That way, a header file with the following line:
#        #@INCLUDE_NEXT@ @NEXT_FOO_H@#       #@INCLUDE_NEXT@ @NEXT_FOO_H@
 # or  # or
#        #@INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ @NEXT_AS_FIRST_DIRECTIVE_FOO_H@#       #@INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ @NEXT_AS_FIRST_DIRECTIVE_FOO_H@
 # behaves (after sed substitution) as if it contained  # behaves (after sed substitution) as if it contained
#        #include_next <foo.h>#       #include_next <foo.h>
 # even if the compiler does not support include_next.  # even if the compiler does not support include_next.
 # The three "///" are to pacify Sun C 5.8, which otherwise would say  # The three "///" are to pacify Sun C 5.8, which otherwise would say
 # "warning: #include of /usr/include/... may be non-portable".  # "warning: #include of /usr/include/... may be non-portable".
Line 121  EOF Line 147  EOF
 # Note: This macro assumes that the header file is not empty after  # Note: This macro assumes that the header file is not empty after
 # preprocessing, i.e. it does not only define preprocessor macros but also  # preprocessing, i.e. it does not only define preprocessor macros but also
 # provides some type/enum definitions or function/variable declarations.  # provides some type/enum definitions or function/variable declarations.
   #
   # This macro also checks whether each header exists, by invoking
   # AC_CHECK_HEADERS_ONCE or AC_CHECK_HEADERS on each argument.
 AC_DEFUN([gl_CHECK_NEXT_HEADERS],  AC_DEFUN([gl_CHECK_NEXT_HEADERS],
 [  [
     gl_NEXT_HEADERS_INTERNAL([$1], [check])
   ])
   
   # gl_NEXT_HEADERS(HEADER1 HEADER2 ...)
   # ------------------------------------
   # Like gl_CHECK_NEXT_HEADERS, except do not check whether the headers exist.
   # This is suitable for headers like <stddef.h> that are standardized by C89
   # and therefore can be assumed to exist.
   AC_DEFUN([gl_NEXT_HEADERS],
   [
     gl_NEXT_HEADERS_INTERNAL([$1], [assume])
   ])
   
   # The guts of gl_CHECK_NEXT_HEADERS and gl_NEXT_HEADERS.
   AC_DEFUN([gl_NEXT_HEADERS_INTERNAL],
   [
   AC_REQUIRE([gl_INCLUDE_NEXT])    AC_REQUIRE([gl_INCLUDE_NEXT])
   AC_REQUIRE([AC_CANONICAL_HOST])    AC_REQUIRE([AC_CANONICAL_HOST])
   AC_CHECK_HEADERS_ONCE([$1])  
   
     m4_if([$2], [check],
       [AC_CHECK_HEADERS_ONCE([$1])
       ])
   
   dnl FIXME: gl_next_header and gl_header_exists must be used unquoted
   dnl until we can assume autoconf 2.64 or newer.
   m4_foreach_w([gl_HEADER_NAME], [$1],    m4_foreach_w([gl_HEADER_NAME], [$1],
     [AS_VAR_PUSHDEF([gl_next_header],      [AS_VAR_PUSHDEF([gl_next_header],
                    [gl_cv_next_]m4_defn([gl_HEADER_NAME]))                    [gl_cv_next_]m4_defn([gl_HEADER_NAME]))
      if test $gl_cv_have_include_next = yes; then       if test $gl_cv_have_include_next = yes; then
       AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>'])       AS_VAR_SET(gl_next_header, ['<'gl_HEADER_NAME'>'])
      else       else
        AC_CACHE_CHECK(         AC_CACHE_CHECK(
         [absolute name of <]m4_defn([gl_HEADER_NAME])[>],         [absolute name of <]m4_defn([gl_HEADER_NAME])[>],
         m4_defn([gl_next_header]),         m4_defn([gl_next_header]),
         [AS_VAR_PUSHDEF([gl_header_exists],         [m4_if([$2], [check],
                         [ac_cv_header_]m4_defn([gl_HEADER_NAME]))            [AS_VAR_PUSHDEF([gl_header_exists],
          if test AS_VAR_GET(gl_header_exists) = yes; then                            [ac_cv_header_]m4_defn([gl_HEADER_NAME]))
            AC_LANG_CONFTEST(             if test AS_VAR_GET(gl_header_exists) = yes; then
              [AC_LANG_SOURCE(             AS_VAR_POPDEF([gl_header_exists])
                 [[#include <]]m4_dquote(m4_defn([gl_HEADER_NAME]))[[>]]            ])
               )])               AC_LANG_CONFTEST(
            dnl AIX "xlc -E" and "cc -E" omit #line directives for header files                 [AC_LANG_SOURCE(
            dnl that contain only a #include of other header files and no                    [[#include <]]m4_dquote(m4_defn([gl_HEADER_NAME]))[[>]]
            dnl non-comment tokens of their own. This leads to a failure to                  )])
            dnl detect the absolute name of <dirent.h>, <signal.h>, <poll.h>               dnl AIX "xlc -E" and "cc -E" omit #line directives for header
            dnl and others. The workaround is to force preservation of comments               dnl files that contain only a #include of other header files and
            dnl through option -C. This ensures all necessary #line directives               dnl no non-comment tokens of their own. This leads to a failure
            dnl are present. GCC supports option -C as well.               dnl to detect the absolute name of <dirent.h>, <signal.h>,
            case "$host_os" in               dnl <poll.h> and others. The workaround is to force preservation
              aix*) gl_absname_cpp="$ac_cpp -C" ;;               dnl of comments through option -C. This ensures all necessary
              *)    gl_absname_cpp="$ac_cpp" ;;               dnl #line directives are present. GCC supports option -C as well.
            esac               case "$host_os" in
            dnl eval is necessary to expand gl_absname_cpp.                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
            dnl Ultrix and Pyramid sh refuse to redirect output of eval,                 *)    gl_absname_cpp="$ac_cpp" ;;
            dnl so use subshell.               esac
            AS_VAR_SET([gl_next_header],               dnl eval is necessary to expand gl_absname_cpp.
              ['"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |               dnl Ultrix and Pyramid sh refuse to redirect output of eval,
               sed -n '\#/]m4_defn([gl_HEADER_NAME])[#{               dnl so use subshell.
                 s#.*"\(.*/]m4_defn([gl_HEADER_NAME])[\)".*#\1#               AS_VAR_SET(gl_next_header,
                 s#^/[^/]#//&#                 ['"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
                 p                  sed -n '\#/]m4_defn([gl_HEADER_NAME])[#{
                 q                    s#.*"\(.*/]m4_defn([gl_HEADER_NAME])[\)".*#\1#
               }'`'"'])                    s#^/[^/]#//&#
          else                    p
            AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>'])                    q
          fi                  }'`'"'])
          AS_VAR_POPDEF([gl_header_exists])])          m4_if([$2], [check],
             [else
                AS_VAR_SET(gl_next_header, ['<'gl_HEADER_NAME'>'])
              fi
             ])
          ])
      fi       fi
      AC_SUBST(       AC_SUBST(
        AS_TR_CPP([NEXT_]m4_defn([gl_HEADER_NAME])),         AS_TR_CPP([NEXT_]m4_defn([gl_HEADER_NAME])),
       [AS_VAR_GET([gl_next_header])])       [AS_VAR_GET(gl_next_header)])
      if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then       if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
        # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'         # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
        gl_next_as_first_directive='<'gl_HEADER_NAME'>'         gl_next_as_first_directive='<'gl_HEADER_NAME'>'
      else       else
        # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'         # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
       gl_next_as_first_directive=AS_VAR_GET([gl_next_header])       gl_next_as_first_directive=AS_VAR_GET(gl_next_header)
      fi       fi
      AC_SUBST(       AC_SUBST(
        AS_TR_CPP([NEXT_AS_FIRST_DIRECTIVE_]m4_defn([gl_HEADER_NAME])),         AS_TR_CPP([NEXT_AS_FIRST_DIRECTIVE_]m4_defn([gl_HEADER_NAME])),
        [$gl_next_as_first_directive])         [$gl_next_as_first_directive])
      AS_VAR_POPDEF([gl_next_header])])       AS_VAR_POPDEF([gl_next_header])])
 ])  ])
   
   # Autoconf 2.68 added warnings for our use of AC_COMPILE_IFELSE;
   # this fallback is safe for all earlier autoconf versions.
   m4_define_default([AC_LANG_DEFINES_PROVIDED])
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

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