c8h4/postgresql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify configure test

Browse source 
The test for lz4.h used AC_CHECK_HEADERS, but nothing was using the
resulting symbol HAVE_LZ4_H.  Change this to use AC_CHECK_HEADER
instead.  This was probably an oversight, seeing that the nearby
similar tests do this correctly.
This commit is contained in:
Peter Eisentraut 2022-05-04 13:33:59 +02:00
parent 0432490d29
commit cfb63b994e
4 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configure vendored
View file

@ -14103,19 +14103,13 @@ $as_echo "$LZ4" >&6; }
fi fi
if test "$with_lz4" = yes; then if test "$with_lz4" = yes; then
for ac_header in lz4.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "lz4.h" "ac_cv_header_lz4_h" "$ac_includes_default" ac_fn_c_check_header_mongrel "$LINENO" "lz4.h" "ac_cv_header_lz4_h" "$ac_includes_default"
if test "x$ac_cv_header_lz4_h" = xyes; then : if test "x$ac_cv_header_lz4_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LZ4_H 1
_ACEOF
else else
as_fn_error $? "lz4.h header file is required for LZ4" "$LINENO" 5 as_fn_error $? "lz4.h header file is required for LZ4" "$LINENO" 5
fi fi
done
fi fi

2
configure.ac
View file

@ -1525,7 +1525,7 @@ fi
PGAC_PATH_PROGS(LZ4, lz4) PGAC_PATH_PROGS(LZ4, lz4)
if test "$with_lz4" = yes; then if test "$with_lz4" = yes; then
AC_CHECK_HEADERS(lz4.h, [], [AC_MSG_ERROR([lz4.h header file is required for LZ4])]) AC_CHECK_HEADER(lz4.h, [], [AC_MSG_ERROR([lz4.h header file is required for LZ4])])
fi fi
PGAC_PATH_PROGS(ZSTD, zstd) PGAC_PATH_PROGS(ZSTD, zstd)

3
src/include/pg_config.h.in
View file

@ -373,9 +373,6 @@
/* Define to 1 if `long long int' works and is 64 bits. */ /* Define to 1 if `long long int' works and is 64 bits. */
#undef HAVE_LONG_LONG_INT_64 #undef HAVE_LONG_LONG_INT_64
/* Define to 1 if you have the <lz4.h> header file. */
#undef HAVE_LZ4_H
/* Define to 1 if you have the <mbarrier.h> header file. */ /* Define to 1 if you have the <mbarrier.h> header file. */
#undef HAVE_MBARRIER_H #undef HAVE_MBARRIER_H

2
src/tools/msvc/Solution.pm
View file

@ -318,7 +318,6 @@ sub GenerateFiles
HAVE_LOCALE_T => 1, HAVE_LOCALE_T => 1,
HAVE_LONG_INT_64 => undef, HAVE_LONG_INT_64 => undef,
HAVE_LONG_LONG_INT_64 => 1, HAVE_LONG_LONG_INT_64 => 1,
HAVE_LZ4_H => undef,
HAVE_MBARRIER_H => undef, HAVE_MBARRIER_H => undef,
HAVE_MBSTOWCS_L => 1, HAVE_MBSTOWCS_L => 1,
HAVE_MEMORY_H => 1, HAVE_MEMORY_H => 1,
@ -541,7 +540,6 @@ sub GenerateFiles
if ($self->{options}->{lz4}) if ($self->{options}->{lz4})
{ {
$define{HAVE_LIBLZ4} = 1; $define{HAVE_LIBLZ4} = 1;
$define{HAVE_LZ4_H} = 1;
$define{USE_LZ4} = 1; $define{USE_LZ4} = 1;
} }
if ($self->{options}->{zstd}) if ($self->{options}->{zstd})