aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2021-07-09 12:38:55 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2021-07-09 12:38:55 -0400
commit5620ec83362d08b9f86c90c97c0a70031c4d0b2c (patch)
tree1398cc8f69aac8b1653a94688a4969b7a6fbe44e /src
parent39b6e85f135f7a1dcf43c0551d7d10e8c57b7fce (diff)
downloadpostgresql-5620ec83362d08b9f86c90c97c0a70031c4d0b2c.tar.gz
postgresql-5620ec83362d08b9f86c90c97c0a70031c4d0b2c.zip
Update configure's probe for libldap to work with OpenLDAP 2.5.
The separate libldap_r is gone and libldap itself is now always thread-safe. Unfortunately there seems no easy way to tell by inspection whether libldap is thread-safe, so we have to take it on faith that libldap is thread-safe if there's no libldap_r. That should be okay, as it appears that libldap_r was a standard part of the installation going back at least 20 years. Report and patch by Adrian Ho. Back-patch to all supported branches, since people might try to build any of them with a newer OpenLDAP. Discussion: https://postgr.es/m/17083-a19190d9591946a7@postgresql.org
Diffstat (limited to 'src')
-rw-r--r--src/include/pg_config.h.in3
-rw-r--r--src/tools/msvc/Solution.pm1
2 files changed, 0 insertions, 4 deletions
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
index 783b8fc1ba7..479c8fe0be7 100644
--- a/src/include/pg_config.h.in
+++ b/src/include/pg_config.h.in
@@ -322,9 +322,6 @@
/* Define to 1 if you have the `ldap' library (-lldap). */
#undef HAVE_LIBLDAP
-/* Define to 1 if you have the `ldap_r' library (-lldap_r). */
-#undef HAVE_LIBLDAP_R
-
/* Define to 1 if you have the `lz4' library (-llz4). */
#undef HAVE_LIBLZ4
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index fcb43b0ca05..b529f78a601 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -302,7 +302,6 @@ sub GenerateFiles
HAVE_LDAP_INITIALIZE => undef,
HAVE_LIBCRYPTO => undef,
HAVE_LIBLDAP => undef,
- HAVE_LIBLDAP_R => undef,
HAVE_LIBLZ4 => undef,
HAVE_LIBM => undef,
HAVE_LIBPAM => undef,