diff options
| -rwxr-xr-x | configure | 16 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | src/include/pg_config.h.in | 6 | ||||
| -rw-r--r-- | src/tools/msvc/Solution.pm | 2 |
4 files changed, 8 insertions, 28 deletions
diff --git a/configure b/configure index 9e8ac510ac0..b28fccbc470 100755 --- a/configure +++ b/configure @@ -14197,19 +14197,13 @@ fi if test "$with_ldap" = yes ; then if test "$PORTNAME" != "win32"; then - for ac_header in ldap.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "ldap.h" "ac_cv_header_ldap_h" "$ac_includes_default" + ac_fn_c_check_header_mongrel "$LINENO" "ldap.h" "ac_cv_header_ldap_h" "$ac_includes_default" if test "x$ac_cv_header_ldap_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LDAP_H 1 -_ACEOF else as_fn_error $? "header file <ldap.h> is required for LDAP" "$LINENO" 5 fi -done { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compatible LDAP implementation" >&5 $as_echo_n "checking for compatible LDAP implementation... " >&6; } @@ -14253,22 +14247,16 @@ $as_echo "$as_me: WARNING: *** also uses LDAP will crash on exit." >&2;} fi else - for ac_header in winldap.h -do : - ac_fn_c_check_header_compile "$LINENO" "winldap.h" "ac_cv_header_winldap_h" "$ac_includes_default + ac_fn_c_check_header_compile "$LINENO" "winldap.h" "ac_cv_header_winldap_h" "$ac_includes_default #include <windows.h> " if test "x$ac_cv_header_winldap_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_WINLDAP_H 1 -_ACEOF else as_fn_error $? "header file <winldap.h> is required for LDAP" "$LINENO" 5 fi -done fi fi diff --git a/configure.ac b/configure.ac index 67cf317c3b5..dd368290a62 100644 --- a/configure.ac +++ b/configure.ac @@ -1547,15 +1547,15 @@ fi if test "$with_ldap" = yes ; then if test "$PORTNAME" != "win32"; then - AC_CHECK_HEADERS(ldap.h, [], - [AC_MSG_ERROR([header file <ldap.h> is required for LDAP])]) + AC_CHECK_HEADER(ldap.h, [], + [AC_MSG_ERROR([header file <ldap.h> is required for LDAP])]) PGAC_LDAP_SAFE else - AC_CHECK_HEADERS(winldap.h, [], - [AC_MSG_ERROR([header file <winldap.h> is required for LDAP])], - [AC_INCLUDES_DEFAULT + AC_CHECK_HEADER(winldap.h, [], + [AC_MSG_ERROR([header file <winldap.h> is required for LDAP])], + [AC_INCLUDES_DEFAULT #include <windows.h> - ]) + ]) fi fi diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index b8fe2201f49..26eb6a2dfef 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -253,9 +253,6 @@ /* Define to 1 if you have the <langinfo.h> header file. */ #undef HAVE_LANGINFO_H -/* Define to 1 if you have the <ldap.h> header file. */ -#undef HAVE_LDAP_H - /* Define to 1 if you have the `ldap_initialize' function. */ #undef HAVE_LDAP_INITIALIZE @@ -541,9 +538,6 @@ /* Define to 1 if you have the `wcstombs_l' function. */ #undef HAVE_WCSTOMBS_L -/* Define to 1 if you have the <winldap.h> header file. */ -#undef HAVE_WINLDAP_H - /* Define to 1 if you have the `X509_get_signature_nid' function. */ #undef HAVE_X509_GET_SIGNATURE_NID diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index 55b30090f6e..fead5c2a72f 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -281,7 +281,6 @@ sub GenerateFiles HAVE_I_CONSTRAINT__BUILTIN_CONSTANT_P => undef, HAVE_KQUEUE => undef, HAVE_LANGINFO_H => undef, - HAVE_LDAP_H => undef, HAVE_LDAP_INITIALIZE => undef, HAVE_LIBCRYPTO => undef, HAVE_LIBLDAP => undef, @@ -374,7 +373,6 @@ sub GenerateFiles HAVE_UUID_OSSP => undef, HAVE_UUID_H => undef, HAVE_UUID_UUID_H => undef, - HAVE_WINLDAP_H => undef, HAVE_WCSTOMBS_L => 1, HAVE_VISIBILITY_ATTRIBUTE => undef, HAVE_X509_GET_SIGNATURE_NID => 1, |