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
commit55cccdfdf1ee63fd8e818c2aa885f4d357773adc (patch)
tree8cd2740099db918ed1323c4ef7a89e3bb6d54af1 /src
parent6edccac166fa55065e88dcc82fc5ed6751485c42 (diff)
downloadpostgresql-55cccdfdf1ee63fd8e818c2aa885f4d357773adc.tar.gz
postgresql-55cccdfdf1ee63fd8e818c2aa885f4d357773adc.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 2fdf6ad2899..66c53c52bbc 100644
--- a/src/include/pg_config.h.in
+++ b/src/include/pg_config.h.in
@@ -316,9 +316,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 `m' library (-lm). */
#undef HAVE_LIBM
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index e3e931e7c11..396c4876241 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -290,7 +290,6 @@ sub GenerateFiles
HAVE_LDAP_INITIALIZE => undef,
HAVE_LIBCRYPTO => undef,
HAVE_LIBLDAP => undef,
- HAVE_LIBLDAP_R => undef,
HAVE_LIBM => undef,
HAVE_LIBPAM => undef,
HAVE_LIBREADLINE => undef,