Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit4ab53b6

Browse files
committed
Don't add HAVE_LDAP_H HAVE_WINLDAP_H to pg_config.h
They're not referenced, so we don't need them in in pg_config.h.Reviewed-by: Peter Eisentraut <peter.eisentraut@enterprisedb.com>Discussion:http://postgr.es/m/e0c44fb2-8b66-a4b9-b274-7ed3a1a0ab74@enterprisedb.com
1 parent6566133 commit4ab53b6

File tree

4 files changed

+8
-28
lines changed

4 files changed

+8
-28
lines changed

‎configure

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14197,19 +14197,13 @@ fi
1419714197

1419814198
if test "$with_ldap" = yes ; then
1419914199
if test "$PORTNAME" != "win32"; then
14200-
for ac_header in ldap.h
14201-
do :
14202-
ac_fn_c_check_header_mongrel "$LINENO" "ldap.h" "ac_cv_header_ldap_h" "$ac_includes_default"
14200+
ac_fn_c_check_header_mongrel "$LINENO" "ldap.h" "ac_cv_header_ldap_h" "$ac_includes_default"
1420314201
if test "x$ac_cv_header_ldap_h" = xyes; then :
14204-
cat >>confdefs.h <<_ACEOF
14205-
#define HAVE_LDAP_H 1
14206-
_ACEOF
1420714202

1420814203
else
1420914204
as_fn_error $? "header file <ldap.h> is required for LDAP" "$LINENO" 5
1421014205
fi
1421114206

14212-
done
1421314207

1421414208
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compatible LDAP implementation" >&5
1421514209
$as_echo_n "checking for compatible LDAP implementation... " >&6; }
@@ -14253,22 +14247,16 @@ $as_echo "$as_me: WARNING:
1425314247
*** also uses LDAP will crash on exit." >&2;}
1425414248
fi
1425514249
else
14256-
for ac_header in winldap.h
14257-
do :
14258-
ac_fn_c_check_header_compile "$LINENO" "winldap.h" "ac_cv_header_winldap_h" "$ac_includes_default
14250+
ac_fn_c_check_header_compile "$LINENO" "winldap.h" "ac_cv_header_winldap_h" "$ac_includes_default
1425914251
#include <windows.h>
1426014252

1426114253
"
1426214254
if test "x$ac_cv_header_winldap_h" = xyes; then :
14263-
cat >>confdefs.h <<_ACEOF
14264-
#define HAVE_WINLDAP_H 1
14265-
_ACEOF
1426614255

1426714256
else
1426814257
as_fn_error $? "header file <winldap.h> is required for LDAP" "$LINENO" 5
1426914258
fi
1427014259

14271-
done
1427214260

1427314261
fi
1427414262
fi

‎configure.ac

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1547,15 +1547,15 @@ fi
15471547

15481548
if test "$with_ldap" = yes ; then
15491549
if test "$PORTNAME" != "win32"; then
1550-
AC_CHECK_HEADERS(ldap.h,[],
1551-
[AC_MSG_ERROR([header file <ldap.h> is required for LDAP])])
1550+
AC_CHECK_HEADER(ldap.h,[],
1551+
[AC_MSG_ERROR([header file <ldap.h> is required for LDAP])])
15521552
PGAC_LDAP_SAFE
15531553
else
1554-
AC_CHECK_HEADERS(winldap.h,[],
1555-
[AC_MSG_ERROR([header file <winldap.h> is required for LDAP])],
1556-
[AC_INCLUDES_DEFAULT
1554+
AC_CHECK_HEADER(winldap.h,[],
1555+
[AC_MSG_ERROR([header file <winldap.h> is required for LDAP])],
1556+
[AC_INCLUDES_DEFAULT
15571557
#include <windows.h>
1558-
])
1558+
])
15591559
fi
15601560
fi
15611561

‎src/include/pg_config.h.in

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -253,9 +253,6 @@
253253
/* Define to 1 if you have the <langinfo.h> header file. */
254254
#undef HAVE_LANGINFO_H
255255

256-
/* Define to 1 if you have the <ldap.h> header file. */
257-
#undef HAVE_LDAP_H
258-
259256
/* Define to 1 if you have the `ldap_initialize' function. */
260257
#undef HAVE_LDAP_INITIALIZE
261258

@@ -541,9 +538,6 @@
541538
/* Define to 1 if you have the `wcstombs_l' function. */
542539
#undef HAVE_WCSTOMBS_L
543540

544-
/* Define to 1 if you have the <winldap.h> header file. */
545-
#undef HAVE_WINLDAP_H
546-
547541
/* Define to 1 if you have the `X509_get_signature_nid' function. */
548542
#undef HAVE_X509_GET_SIGNATURE_NID
549543

‎src/tools/msvc/Solution.pm

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,6 @@ sub GenerateFiles
281281
HAVE_I_CONSTRAINT__BUILTIN_CONSTANT_P=>undef,
282282
HAVE_KQUEUE=>undef,
283283
HAVE_LANGINFO_H=>undef,
284-
HAVE_LDAP_H=>undef,
285284
HAVE_LDAP_INITIALIZE=>undef,
286285
HAVE_LIBCRYPTO=>undef,
287286
HAVE_LIBLDAP=>undef,
@@ -374,7 +373,6 @@ sub GenerateFiles
374373
HAVE_UUID_OSSP=>undef,
375374
HAVE_UUID_H=>undef,
376375
HAVE_UUID_UUID_H=>undef,
377-
HAVE_WINLDAP_H=>undef,
378376
HAVE_WCSTOMBS_L=> 1,
379377
HAVE_VISIBILITY_ATTRIBUTE=>undef,
380378
HAVE_X509_GET_SIGNATURE_NID=> 1,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp