diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-05-20 15:49:28 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-05-24 17:47:48 +0200 |
| commit | 20f9b3f50e4c4037060cc1b411520527baa26769 (patch) | |
| tree | 7a57ede50e94b9beb983c1678c4ee1de255a13b3 | |
| parent | postgres: fix internal linking with WITH_GSSAPI (diff) | |
| download | core-20f9b3f50e4c4037060cc1b411520527baa26769.tar.gz core-20f9b3f50e4c4037060cc1b411520527baa26769.zip | |
configure: OpenLDAP depends on NSS
... at least in LO's internal build variant.
Change-Id: I134d1ed3a0a9654e264ccc66cdbe993a355620cb
| -rw-r--r-- | configure.ac | 66 |
1 files changed, 35 insertions, 31 deletions
diff --git a/configure.ac b/configure.ac index faa4d810e8da..ebabc8f8842d 100644 --- a/configure.ac +++ b/configure.ac @@ -10289,56 +10289,60 @@ fi AC_SUBST(SYSTEM_ODBC_HEADERS) dnl =================================================================== +dnl Check for system NSS +dnl =================================================================== +if test "$enable_fuzzers" != "yes" -a "$enable_nss" = "yes"; then + libo_CHECK_SYSTEM_MODULE([nss],[NSS],[nss >= 3.9.3 nspr >= 4.8]) + AC_DEFINE(HAVE_FEATURE_NSS) + ENABLE_NSS="TRUE" + AC_DEFINE(ENABLE_NSS) +elif test $_os != iOS ; then + with_tls=openssl +fi +AC_SUBST(ENABLE_NSS) + +dnl =================================================================== dnl Enable LDAP support dnl =================================================================== if test "$_os" != "WINNT" -a "$_os" != "iOS" -a "$_os" != "Android"; then -AC_MSG_CHECKING([whether to enable LDAP support]) - if test "$enable_ldap" != "yes"; then - AC_MSG_RESULT([no]) + AC_MSG_CHECKING([whether to enable LDAP support]) + if test "$enable_ldap" != "yes" -o "$ENABLE_NSS" != TRUE; then + if test "$enable_ldap" != "yes"; then + AC_MSG_RESULT([no]) + else + AC_MSG_RESULT([no (needs NSS)]) + fi ENABLE_LDAP="" enable_ldap=no else AC_MSG_RESULT([yes]) ENABLE_LDAP="TRUE" fi -fi -AC_SUBST(ENABLE_LDAP) dnl =================================================================== dnl Check for system openldap dnl =================================================================== -if test "$_os" != "WINNT" -a "$_os" != "iOS" -a "$_os" != "Android" -a "$ENABLE_LDAP" != ""; then -AC_MSG_CHECKING([which openldap library to use]) -if test "$with_system_openldap" = "yes"; then - AC_MSG_RESULT([external]) - SYSTEM_OPENLDAP=TRUE - AC_CHECK_HEADERS(ldap.h, [], [AC_MSG_ERROR(ldap.h not found. install openldap libs)], []) - AC_CHECK_LIB([ldap], [ldap_simple_bind_s], [:], [AC_MSG_ERROR(openldap lib not found or functional)], []) - AC_CHECK_LIB([ldap], [ldap_set_option], [:], [AC_MSG_ERROR(openldap lib not found or functional)], []) -else - AC_MSG_RESULT([internal]) - SYSTEM_OPENLDAP= - BUILD_TYPE="$BUILD_TYPE OPENLDAP" -fi + if test "$ENABLE_LDAP" != ""; then + AC_MSG_CHECKING([which openldap library to use]) + if test "$with_system_openldap" = "yes"; then + AC_MSG_RESULT([external]) + SYSTEM_OPENLDAP=TRUE + AC_CHECK_HEADERS(ldap.h, [], [AC_MSG_ERROR(ldap.h not found. install openldap libs)], []) + AC_CHECK_LIB([ldap], [ldap_simple_bind_s], [:], [AC_MSG_ERROR(openldap lib not found or functional)], []) + AC_CHECK_LIB([ldap], [ldap_set_option], [:], [AC_MSG_ERROR(openldap lib not found or functional)], []) + else + AC_MSG_RESULT([internal]) + SYSTEM_OPENLDAP= + BUILD_TYPE="$BUILD_TYPE OPENLDAP" + fi + fi fi +AC_SUBST(ENABLE_LDAP) AC_SUBST(SYSTEM_OPENLDAP) dnl =================================================================== -dnl Check for system NSS -dnl =================================================================== -if test "$enable_fuzzers" != "yes" -a "$enable_nss" = "yes"; then - libo_CHECK_SYSTEM_MODULE([nss],[NSS],[nss >= 3.9.3 nspr >= 4.8]) - AC_DEFINE(HAVE_FEATURE_NSS) - ENABLE_NSS="TRUE" - AC_DEFINE(ENABLE_NSS) -elif test $_os != iOS ; then - with_tls=openssl -fi -AC_SUBST(ENABLE_NSS) - -dnl =================================================================== dnl Check for TLS/SSL and cryptographic implementation to use dnl =================================================================== AC_MSG_CHECKING([which TLS/SSL and cryptographic implementation to use]) |