aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigure13
-rw-r--r--configure.ac3
-rw-r--r--src/include/pg_config.h.in3
-rw-r--r--src/tools/msvc/Solution.pm1
4 files changed, 1 insertions, 19 deletions
diff --git a/configure b/configure
index fe66b79d69a..06ad9aeb714 100755
--- a/configure
+++ b/configure
@@ -13582,15 +13582,6 @@ fi
fi
if test "$with_lz4" = yes; then
- for ac_header in lz4/lz4.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "lz4/lz4.h" "ac_cv_header_lz4_lz4_h" "$ac_includes_default"
-if test "x$ac_cv_header_lz4_lz4_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LZ4_LZ4_H 1
-_ACEOF
-
-else
for ac_header in lz4.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "lz4.h" "ac_cv_header_lz4_h" "$ac_includes_default"
@@ -13607,10 +13598,6 @@ done
fi
-done
-
-fi
-
if test "$with_gssapi" = yes ; then
for ac_header in gssapi/gssapi.h
do :
diff --git a/configure.ac b/configure.ac
index 76568d1e4b0..92193f35fb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1440,8 +1440,7 @@ Use --without-zlib to disable zlib support.])])
fi
if test "$with_lz4" = yes; then
- AC_CHECK_HEADERS(lz4/lz4.h, [],
- [AC_CHECK_HEADERS(lz4.h, [], [AC_MSG_ERROR([lz4.h header file is required for LZ4])])])
+ AC_CHECK_HEADERS(lz4.h, [], [AC_MSG_ERROR([lz4.h header file is required for LZ4])])
fi
if test "$with_gssapi" = yes ; then
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
index fcbf3367048..5e2255a2f53 100644
--- a/src/include/pg_config.h.in
+++ b/src/include/pg_config.h.in
@@ -364,9 +364,6 @@
/* Define to 1 if you have the <lz4.h> header file. */
#undef HAVE_LZ4_H
-/* Define to 1 if you have the <lz4/lz4.h> header file. */
-#undef HAVE_LZ4_LZ4_H
-
/* Define to 1 if you have the <mbarrier.h> header file. */
#undef HAVE_MBARRIER_H
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index 9342347c9e5..710f26f8ab3 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -313,7 +313,6 @@ sub GenerateFiles
HAVE_LONG_INT_64 => undef,
HAVE_LONG_LONG_INT_64 => 1,
HAVE_LZ4_H => undef,
- HAVE_LZ4_LZ4_H => undef,
HAVE_MBARRIER_H => undef,
HAVE_MBSTOWCS_L => 1,
HAVE_MEMORY_H => 1,