From: Bruno Haible <bruno@clisp.org>
Date: Mon, 19 Jun 2023 09:16:46 +0000 (+0200)
Subject: build: Remove redundant .m4 file.
X-Git-Tag: v0.23~435
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8be34775a30eacebfd007e3387dc1953fc76b3f0;p=thirdparty%2Fgettext.git

build: Remove redundant .m4 file.

* gettext-runtime/m4/flexmember.m4: Remove file.
* gettext-runtime/m4/Makefile.am (EXTRA_DIST): Remove it.
* Makefile.am (distcheck-hook): Don't check it.
---

diff --git a/Makefile.am b/Makefile.am
index 871e30330..737fd5b2a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,7 +73,6 @@ distcheck-hook:
 	cmp -s $(srcdir)/gettext-runtime/po/remove-potcdate.sin $(srcdir)/gettext-tools/po/remove-potcdate.sin
 	cmp -s $(srcdir)/gettext-runtime/po/remove-potcdate.sin $(srcdir)/gettext-tools/examples/po/remove-potcdate.sin
 	cmp -s $(srcdir)/gettext-runtime/m4/build-to-host.m4 $(srcdir)/gettext-tools/gnulib-m4/build-to-host.m4
-	cmp -s $(srcdir)/gettext-runtime/m4/flexmember.m4 $(srcdir)/gettext-tools/gnulib-m4/flexmember.m4
 	cmp -s $(srcdir)/gettext-runtime/m4/gettext.m4 $(srcdir)/gettext-tools/gnulib-m4/gettext.m4
 	cmp -s $(srcdir)/gettext-runtime/m4/iconv.m4 $(srcdir)/gettext-tools/gnulib-m4/iconv.m4
 	cmp -s $(srcdir)/gettext-runtime/m4/intlmacosx.m4 $(srcdir)/gettext-tools/gnulib-m4/intlmacosx.m4
diff --git a/gettext-runtime/m4/Makefile.am b/gettext-runtime/m4/Makefile.am
index b952d40b7..53aca4102 100644
--- a/gettext-runtime/m4/Makefile.am
+++ b/gettext-runtime/m4/Makefile.am
@@ -20,7 +20,6 @@
 # find . -type f -name '*.m4' -printf '%f\n' | sort | tr '\012' @ | sed 's/@$/%/;s/@/ \\@/g' | tr @% '\012\012'
 EXTRA_DIST = README \
 build-to-host.m4 \
-flexmember.m4 \
 gettext.m4 \
 glibc2.m4 \
 iconv.m4 \
diff --git a/gettext-runtime/m4/flexmember.m4 b/gettext-runtime/m4/flexmember.m4
deleted file mode 100644
index 13f7e870d..000000000
--- a/gettext-runtime/m4/flexmember.m4
+++ /dev/null
@@ -1,44 +0,0 @@
-# serial 5
-# Check for flexible array member support.
-
-# Copyright (C) 2006, 2009-2023 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# Written by Paul Eggert.
-
-AC_DEFUN([AC_C_FLEXIBLE_ARRAY_MEMBER],
-[
-  AC_CACHE_CHECK([for flexible array member],
-    ac_cv_c_flexmember,
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <stdlib.h>
-            #include <stdio.h>
-            #include <stddef.h>
-            struct m { struct m *next, **list; char name[]; };
-            struct s { struct s *p; struct m *m; int n; double d[]; };]],
-          [[int m = getchar ();
-            size_t nbytes = offsetof (struct s, d) + m * sizeof (double);
-            nbytes += sizeof (struct s) - 1;
-            nbytes -= nbytes % sizeof (struct s);
-            struct s *p = malloc (nbytes);
-            p->p = p;
-            p->m = NULL;
-            p->d[0] = 0.0;
-            return p->d != (double *) NULL;]])],
-       [ac_cv_c_flexmember=yes],
-       [ac_cv_c_flexmember=no])])
-  if test $ac_cv_c_flexmember = yes; then
-    AC_DEFINE([FLEXIBLE_ARRAY_MEMBER], [],
-      [Define to nothing if C supports flexible array members, and to
-       1 if it does not.  That way, with a declaration like 'struct s
-       { int n; short d@<:@FLEXIBLE_ARRAY_MEMBER@:>@; };', the struct hack
-       can be used with pre-C99 compilers.
-       Use 'FLEXSIZEOF (struct s, d, N * sizeof (short))' to calculate
-       the size in bytes of such a struct containing an N-element array.])
-  else
-    AC_DEFINE([FLEXIBLE_ARRAY_MEMBER], [1])
-  fi
-])