diff --git a/ChangeLog b/ChangeLog index 517dee2..e2ac3bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2025-04-16 Bruno Haible + build: Update after gnulib changed. + * gnulib-local/lib/getopt-pfx-ext.h.diff: Remove file. + * Makefile.in (SOURCE_FILES): Remove it. + build: Use more gnulib modules. * autogen.sh (GNULIB_MODULES): Add getopt-gnu. Use directory gnulib-local. diff --git a/Makefile.in b/Makefile.in index e5fdedd..4d73577 100644 --- a/Makefile.in +++ b/Makefile.in @@ -67,8 +67,7 @@ maintainer-clean : force SOURCE_FILES = \ README INSTALL.windows NEWS AUTHORS JOIN-GNU \ autogen.sh configure.ac aclocal.m4 Makefile.in \ - Makefile.devel ChangeLog \ - gnulib-local/lib/getopt-pfx-ext.h.diff + Makefile.devel ChangeLog # List of distributed files imported from other packages. IMPORTED_FILES = \ COPYING INSTALL \ diff --git a/gnulib-local/lib/getopt-pfx-ext.h.diff b/gnulib-local/lib/getopt-pfx-ext.h.diff deleted file mode 100644 index 5a0695c..0000000 --- a/gnulib-local/lib/getopt-pfx-ext.h.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/lib/getopt-pfx-ext.h b/lib/getopt-pfx-ext.h -index 1f2b2d71bf..a61c68c795 100644 ---- a/lib/getopt-pfx-ext.h -+++ b/lib/getopt-pfx-ext.h -@@ -38,11 +38,9 @@ - # endif - # undef getopt_long - # undef getopt_long_only --# undef option - # undef _getopt_internal - # define getopt_long __GETOPT_ID (getopt_long) - # define getopt_long_only __GETOPT_ID (getopt_long_only) --# define option __GETOPT_ID (option) - # define _getopt_internal __GETOPT_ID (getopt_internal) - - /* The system's getopt.h may have already included getopt-ext.h to