* 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.
2017-04-06 Paul Eggert <eggert@cs.ucla.edu>
+ 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 <config.h>, not "config.h".
-# 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,
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.
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: