← Back to branch summary

~vcs-imports/grub/grub2-bzr

« back to all changes in this revision

Viewing changes to m4/argp.m4

  • Committer: Vladimir 'phcoder' Serbinenko
  • Date: 2013-04-11 19:12:46 UTC
  • Revision ID: phcoder@gmail.com-20130411191246-fz1xdy47z3vv2kt8
        Import new gnulib.

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/argp.m4
1
 
# argp.m4 serial 11
2
 
dnl Copyright (C) 2003-2010 Free Software Foundation, Inc.
 
1
# argp.m4 serial 14
 
2
dnl Copyright (C) 2003-2013 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.
9
9
  AC_REQUIRE([AC_C_INLINE])
10
10
  AC_REQUIRE([AC_C_RESTRICT])
11
11
  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
12
 
  dnl argp-parse.c depends on GNU getopt internals, therefore use GNU getopt
13
 
  dnl always.
14
 
  gl_REPLACE_GETOPT
15
 
  dnl Note: gl_REPLACE_GETOPT does AC_LIBOBJ([getopt]), AC_LIBOBJ([getopt1]).
16
12
 
17
 
  AC_CHECK_DECL([program_invocation_name],
18
 
                [AC_DEFINE([HAVE_DECL_PROGRAM_INVOCATION_NAME], [1],
19
 
                           [Define if program_invocation_name is declared])],
20
 
                [AC_DEFINE([GNULIB_PROGRAM_INVOCATION_NAME], [1],
21
 
                           [Define to 1 to add extern declaration of program_invocation_name to argp.h])],
22
 
                [#include <errno.h>])
23
 
  AC_CHECK_DECL([program_invocation_short_name],
24
 
                [AC_DEFINE([HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME], [1],
25
 
                           [Define if program_invocation_short_name is declared])],
26
 
                [AC_DEFINE([GNULIB_PROGRAM_INVOCATION_SHORT_NAME], [1],
27
 
                           [Define to 1 to add extern declaration of program_invocation_short_name to argp.h])],
28
 
                [#include <errno.h>])
 
13
  AC_CHECK_DECLS([program_invocation_name], [],
 
14
                 [AC_DEFINE([GNULIB_PROGRAM_INVOCATION_NAME], [1],
 
15
                            [Define to 1 to add extern declaration of program_invocation_name to argp.h])],
 
16
                 [[#include <errno.h>]])
 
17
  AC_CHECK_DECLS([program_invocation_short_name], [],
 
18
                 [AC_DEFINE([GNULIB_PROGRAM_INVOCATION_SHORT_NAME], [1],
 
19
                            [Define to 1 to add extern declaration of program_invocation_short_name to argp.h])],
 
20
                 [[#include <errno.h>]])
29
21
 
30
22
  # Check if program_invocation_name and program_invocation_short_name
31
23
  # are defined elsewhere. It is improbable that only one of them will
63
55
  AC_CHECK_FUNCS_ONCE([flockfile funlockfile])
64
56
  AC_CHECK_HEADERS_ONCE([features.h linewrap.h])
65
57
])
 
58
 
 
59
dnl argp-parse.c depends on GNU getopt internals, therefore use GNU getopt
 
60
dnl always.
 
61
AC_DEFUN([gl_REPLACE_GETOPT_ALWAYS], [])