← Back to branch summary

~ubuntu-branches/ubuntu/saucy/gnutls26/saucy-updates

« back to all changes in this revision

Viewing changes to gl/m4/include_next.m4

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2012-12-06 18:29:32 UTC
  • mfrom: (12.1.33 sid)
  • Revision ID: package-import@ubuntu.com-20121206182932-iih7i83juh8cdotf
Tags: 2.12.20-2ubuntu1
* Resynchronise with Debian.  Remaining changes:
  - Build gnutls-bin from this source package rather than from gnutls28:
    gnutls28's licensing is currently too strict for many of the free
    software packages built against it in Ubuntu main and we only want to
    support a single version.  Bump its version to achieve this.
* Avoid assuming that gets is declared.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gl/m4/include_next.m4
1
 
# include_next.m4 serial 22
2
 
dnl Copyright (C) 2006-2011 Free Software Foundation, Inc.
 
1
# include_next.m4 serial 23
 
2
dnl Copyright (C) 2006-2012 Free Software Foundation, Inc.
3
3
dnl This file is free software; the Free Software Foundation
4
4
dnl gives unlimited permission to copy and/or distribute it,
5
5
dnl with or without modifications, as long as this notice is preserved.
143
143
# even if the compiler does not support include_next.
144
144
# The three "///" are to pacify Sun C 5.8, which otherwise would say
145
145
# "warning: #include of /usr/include/... may be non-portable".
146
 
# Use `""', not `<>', so that the /// cannot be confused with a C99 comment.
 
146
# Use '""', not '<>', so that the /// cannot be confused with a C99 comment.
147
147
# Note: This macro assumes that the header file is not empty after
148
148
# preprocessing, i.e. it does not only define preprocessor macros but also
149
149
# provides some type/enum definitions or function/variable declarations.
219
219
                   gl_dirsep_regex='[/\\]'
220
220
                   ;;
221
221
                 *)
222
 
                   gl_dirsep_regex='/'
 
222
                   gl_dirsep_regex='\/'
223
223
                   ;;
224
224
               esac
 
225
               dnl A sed expression that turns a string into a basic regular
 
226
               dnl expression, for use within "/.../".
 
227
               gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
225
228
changequote([,])
226
 
               gl_absolute_header_sed='\|'"${gl_dirsep_regex}"']m4_defn([gl_HEADER_NAME])[|{
227
 
                   s|.*"\(.*'"${gl_dirsep_regex}"']m4_defn([gl_HEADER_NAME])[\)".*|\1|
 
229
               gl_header_literal_regex=`echo ']m4_defn([gl_HEADER_NAME])[' \
 
230
                                        | sed -e "$gl_make_literal_regex_sed"`
 
231
               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
 
232
                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
228
233
changequote(,)dnl
229
234
                   s|^/[^/]|//&|
230
235
changequote([,])dnl