Skip to content

Commit 2c75f8a

Browse files
committed
Remove useless configure probe for <lz4/lz4.h>.
This seems to have been just copied-and-pasted from some other header checks. But our C code is entirely unprepared to support such a header name, so it's only wasting cycles to look for it. If we did need to support it, some #ifdefs would be required. (A quick trawl at codesearch.debian.net finds some packages that reference lz4/lz4.h; but they use *only* that spelling, and appear to be intending to reference their own copy rather than a system-level installation of liblz4. There's no evidence of freestanding installations that require this spelling.) Discussion: https://postgr.es/m/[email protected]
1 parent a4d5284 commit 2c75f8a

File tree

4 files changed

+1
-19
lines changed

4 files changed

+1
-19
lines changed

configure

-13
Original file line numberDiff line numberDiff line change
@@ -13582,15 +13582,6 @@ fi
1358213582
fi
1358313583

1358413584
if test "$with_lz4" = yes; then
13585-
for ac_header in lz4/lz4.h
13586-
do :
13587-
ac_fn_c_check_header_mongrel "$LINENO" "lz4/lz4.h" "ac_cv_header_lz4_lz4_h" "$ac_includes_default"
13588-
if test "x$ac_cv_header_lz4_lz4_h" = xyes; then :
13589-
cat >>confdefs.h <<_ACEOF
13590-
#define HAVE_LZ4_LZ4_H 1
13591-
_ACEOF
13592-
13593-
else
1359413585
for ac_header in lz4.h
1359513586
do :
1359613587
ac_fn_c_check_header_mongrel "$LINENO" "lz4.h" "ac_cv_header_lz4_h" "$ac_includes_default"
@@ -13607,10 +13598,6 @@ done
1360713598

1360813599
fi
1360913600

13610-
done
13611-
13612-
fi
13613-
1361413601
if test "$with_gssapi" = yes ; then
1361513602
for ac_header in gssapi/gssapi.h
1361613603
do :

configure.ac

+1-2
Original file line numberDiff line numberDiff line change
@@ -1440,8 +1440,7 @@ Use --without-zlib to disable zlib support.])])
14401440
fi
14411441

14421442
if test "$with_lz4" = yes; then
1443-
AC_CHECK_HEADERS(lz4/lz4.h, [],
1444-
[AC_CHECK_HEADERS(lz4.h, [], [AC_MSG_ERROR([lz4.h header file is required for LZ4])])])
1443+
AC_CHECK_HEADERS(lz4.h, [], [AC_MSG_ERROR([lz4.h header file is required for LZ4])])
14451444
fi
14461445

14471446
if test "$with_gssapi" = yes ; then

src/include/pg_config.h.in

-3
Original file line numberDiff line numberDiff line change
@@ -364,9 +364,6 @@
364364
/* Define to 1 if you have the <lz4.h> header file. */
365365
#undef HAVE_LZ4_H
366366

367-
/* Define to 1 if you have the <lz4/lz4.h> header file. */
368-
#undef HAVE_LZ4_LZ4_H
369-
370367
/* Define to 1 if you have the <mbarrier.h> header file. */
371368
#undef HAVE_MBARRIER_H
372369

src/tools/msvc/Solution.pm

-1
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,6 @@ sub GenerateFiles
313313
HAVE_LONG_INT_64 => undef,
314314
HAVE_LONG_LONG_INT_64 => 1,
315315
HAVE_LZ4_H => undef,
316-
HAVE_LZ4_LZ4_H => undef,
317316
HAVE_MBARRIER_H => undef,
318317
HAVE_MBSTOWCS_L => 1,
319318
HAVE_MEMORY_H => 1,

0 commit comments

Comments
 (0)