Skip to content

Commit cfb63b9

Browse files
committed
Simplify configure test
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.
1 parent 0432490 commit cfb63b9

File tree

4 files changed

+1
-12
lines changed

4 files changed

+1
-12
lines changed

configure

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14103,19 +14103,13 @@ $as_echo "$LZ4" >&6; }
1410314103
fi
1410414104

1410514105
if test "$with_lz4" = yes; then
14106-
for ac_header in lz4.h
14107-
do :
1410814106
ac_fn_c_check_header_mongrel "$LINENO" "lz4.h" "ac_cv_header_lz4_h" "$ac_includes_default"
1410914107
if test "x$ac_cv_header_lz4_h" = xyes; then :
14110-
cat >>confdefs.h <<_ACEOF
14111-
#define HAVE_LZ4_H 1
14112-
_ACEOF
1411314108

1411414109
else
1411514110
as_fn_error $? "lz4.h header file is required for LZ4" "$LINENO" 5
1411614111
fi
1411714112

14118-
done
1411914113

1412014114
fi
1412114115

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1525,7 +1525,7 @@ fi
15251525

15261526
PGAC_PATH_PROGS(LZ4, lz4)
15271527
if test "$with_lz4" = yes; then
1528-
AC_CHECK_HEADERS(lz4.h, [], [AC_MSG_ERROR([lz4.h header file is required for LZ4])])
1528+
AC_CHECK_HEADER(lz4.h, [], [AC_MSG_ERROR([lz4.h header file is required for LZ4])])
15291529
fi
15301530

15311531
PGAC_PATH_PROGS(ZSTD, zstd)

src/include/pg_config.h.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -373,9 +373,6 @@
373373
/* Define to 1 if `long long int' works and is 64 bits. */
374374
#undef HAVE_LONG_LONG_INT_64
375375

376-
/* Define to 1 if you have the <lz4.h> header file. */
377-
#undef HAVE_LZ4_H
378-
379376
/* Define to 1 if you have the <mbarrier.h> header file. */
380377
#undef HAVE_MBARRIER_H
381378

src/tools/msvc/Solution.pm

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,6 @@ sub GenerateFiles
318318
HAVE_LOCALE_T => 1,
319319
HAVE_LONG_INT_64 => undef,
320320
HAVE_LONG_LONG_INT_64 => 1,
321-
HAVE_LZ4_H => undef,
322321
HAVE_MBARRIER_H => undef,
323322
HAVE_MBSTOWCS_L => 1,
324323
HAVE_MEMORY_H => 1,
@@ -541,7 +540,6 @@ sub GenerateFiles
541540
if ($self->{options}->{lz4})
542541
{
543542
$define{HAVE_LIBLZ4} = 1;
544-
$define{HAVE_LZ4_H} = 1;
545543
$define{USE_LZ4} = 1;
546544
}
547545
if ($self->{options}->{zstd})

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy