Mercurial > hg > octave-kai > gnulib-hg
changeset 11816:67129c87eef7
Restore the gl_GETOPT_SUBSTITUTE macro, under a new name.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Wed, 12 Aug 2009 22:18:21 +0200 |
parents | 390478a4c68f |
children | 0cb0c5c1d5c5 |
files | ChangeLog m4/argp.m4 m4/getopt.m4 |
diffstat | 3 files changed, 25 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2009-08-12 Bruno Haible <bruno@clisp.org> + * m4/getopt.m4 (gl_REPLACE_GETOPT): New macro, was called + gl_GETOPT_SUBSTITUTE before. + (gl_GETOPT): Use it. + * m4/argp.m4 (gl_ARGP): Update. + Reported by Sergey Poznyakoff. + * m4/getopt.m4: Reorder macros. (gl_GETOPT): Inline gl_GETOPT_SUBSTITUTE. (gl_GETOPT_SUBSTITUTE): Remove macro.
--- a/m4/argp.m4 +++ b/m4/argp.m4 @@ -1,4 +1,4 @@ -# argp.m4 serial 9 +# argp.m4 serial 10 dnl Copyright (C) 2003-2007, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -11,8 +11,8 @@ AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) dnl argp-parse.c depends on GNU getopt internals, therefore use GNU getopt dnl always. - gl_GETOPT_SUBSTITUTE - dnl Note: gl_GETOPT_SUBSTITUTE does AC_LIBOBJ([getopt]), AC_LIBOBJ([getopt1]). + gl_REPLACE_GETOPT + dnl Note: gl_REPLACE_GETOPT does AC_LIBOBJ([getopt]), AC_LIBOBJ([getopt1]). AC_CHECK_DECL([program_invocation_name], [AC_DEFINE([HAVE_DECL_PROGRAM_INVOCATION_NAME], [1],
--- a/m4/getopt.m4 +++ b/m4/getopt.m4 @@ -1,4 +1,4 @@ -# getopt.m4 serial 18 +# getopt.m4 serial 19 dnl Copyright (C) 2002-2006, 2008-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -13,17 +13,24 @@ [ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) gl_GETOPT_IFELSE([ - dnl Arrange for getopt.h to be created. - gl_GETOPT_SUBSTITUTE_HEADER - dnl Arrange for unistd.h to include getopt.h. - GNULIB_UNISTD_H_GETOPT=1 - dnl Arrange to compile the getopt implementation. - AC_LIBOBJ([getopt]) - AC_LIBOBJ([getopt1]) - gl_PREREQ_GETOPT + gl_REPLACE_GETOPT ]) ]) +# Request the gnulib implementation of the getopt functions unconditionally. +# argp.m4 uses this. +AC_DEFUN([gl_REPLACE_GETOPT], +[ + dnl Arrange for getopt.h to be created. + gl_GETOPT_SUBSTITUTE_HEADER + dnl Arrange for unistd.h to include getopt.h. + GNULIB_UNISTD_H_GETOPT=1 + dnl Arrange to compile the getopt implementation. + AC_LIBOBJ([getopt]) + AC_LIBOBJ([getopt1]) + gl_PREREQ_GETOPT +]) + # emacs' configure.in uses this. AC_DEFUN([gl_GETOPT_IFELSE], [