From: Paul Eggert Date: Thu, 6 Apr 2017 22:41:05 +0000 (-0700) Subject: getopt-gnu: omit some duplicate code X-Git-Tag: v1.0~6285 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=28ac412baf1c48b73ebc6057879626b0b1aa2a59;p=gnulib.git getopt-gnu: omit some duplicate code * m4/getopt.m4 (gl_FUNC_GETOPT_GNU): Don’t require gl_FUNC_GETOPT_POSIX, as the configure.ac code generated by gnulib-tool already does this. * modules/getopt-gnu (configure.ac): Omit code duplicated from getopt-posix, which we depend on. --- diff --git a/ChangeLog b/ChangeLog index 3f7c6f5a46..db893f5e16 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2017-04-06 Paul Eggert + getopt-gnu: omit some duplicate code + * m4/getopt.m4 (gl_FUNC_GETOPT_GNU): Don’t require + gl_FUNC_GETOPT_POSIX, as the configure.ac code generated by + gnulib-tool already does this. + * modules/getopt-gnu (configure.ac): Omit code duplicated from + getopt-posix, which we depend on. + getopt-posix: use angle-bracket include * lib/getopt1.c: Include , not "config.h". diff --git a/m4/getopt.m4 b/m4/getopt.m4 index 139a814c6b..d90076922b 100644 --- a/m4/getopt.m4 +++ b/m4/getopt.m4 @@ -1,4 +1,4 @@ -# getopt.m4 serial 44 +# getopt.m4 serial 45 dnl Copyright (C) 2002-2006, 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -33,8 +33,6 @@ AC_DEFUN([gl_FUNC_GETOPT_POSIX], AC_DEFUN([gl_FUNC_GETOPT_GNU], [ m4_divert_text([INIT_PREPARE], [gl_getopt_required=GNU]) - - AC_REQUIRE([gl_FUNC_GETOPT_POSIX]) ]) # Determine whether to replace the entire getopt facility. diff --git a/modules/getopt-gnu b/modules/getopt-gnu index 9c348ed25f..974ce1400f 100644 --- a/modules/getopt-gnu +++ b/modules/getopt-gnu @@ -10,13 +10,6 @@ getopt-posix configure.ac: gl_FUNC_GETOPT_GNU -if test $REPLACE_GETOPT = 1; then - AC_LIBOBJ([getopt]) - AC_LIBOBJ([getopt1]) - dnl Arrange for unistd.h to include getopt.h. - GNULIB_${gl_include_guard_prefix}_UNISTD_H_GETOPT=1 -fi -AC_SUBST([GNULIB_${gl_include_guard_prefix}_UNISTD_H_GETOPT]) Makefile.am: