From 97da508e246dd036fabaa5b40a7c95ad48ef1fb7 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 31 Oct 2024 20:51:10 +0100 Subject: [PATCH] crc: Avoid potential conflict with other configure.ac files. Suggested by Simon Josefsson. * modules/crc (configure.ac, Makefile.am): Rename CROSS_COMPILING to GL_CROSS_COMPILING. --- ChangeLog | 7 +++++++ modules/crc | 8 +++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 62c9f9b88f..711d08f058 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2024-10-31 Bruno Haible + + crc: Avoid potential conflict with other configure.ac files. + Suggested by Simon Josefsson. + * modules/crc (configure.ac, Makefile.am): Rename CROSS_COMPILING to + GL_CROSS_COMPILING. + 2024-10-31 Sam Russell crc: Fix compile warnings diff --git a/modules/crc b/modules/crc index e8b0d91ea6..f3122ddd3b 100644 --- a/modules/crc +++ b/modules/crc @@ -13,8 +13,10 @@ endian configure.ac: AC_REQUIRE([gl_CRC_SLICE_BY_8]) -CROSS_COMPILING=$cross_compiling -AC_SUBST([CROSS_COMPILING]) +# Set to 'yes' if executables created by the C compiler $CC can be run in the +# build environment, or to 'no' otherwise. +GL_CROSS_COMPILING=$cross_compiling +AC_SUBST([GL_CROSS_COMPILING]) AC_PROG_MKDIR_P Makefile.am: @@ -28,7 +30,7 @@ lib_SOURCES += crc.c # $(AM_LDFLAGS). And do the compilation in a temporary directory, where # gnulib-generated stdio.h and stdlib.h files are not visible. $(srcdir)/crc-sliceby8.h: $(srcdir)/crc-generate-table.c - if test @CROSS_COMPILING@ = no; then \ + if test @GL_CROSS_COMPILING@ = no; then \ $(MKDIR_P) crc-tmp \ && abs_srcdir=`cd $(srcdir) && pwd` \ && (cd crc-tmp \ -- 2.39.5