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

Commitc469aed

Browse files
committed
Remove no-longer-needed configure test for krb5_encrypt(), per Jim Gates.
1 parent4fe8ba6 commitc469aed

File tree

2 files changed

+1
-133
lines changed

2 files changed

+1
-133
lines changed

‎configure

Lines changed: 0 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -6573,136 +6573,6 @@ echo "$as_me: error: could not find function 'com_err' required for Kerberos 5"
65736573
{ (exit 1); exit 1; }; }
65746574
fi
65756575

6576-
echo "$as_me:$LINENO: checking for library containing krb5_encrypt" >&5
6577-
echo $ECHO_N "checking for library containing krb5_encrypt... $ECHO_C" >&6
6578-
if test "${ac_cv_search_krb5_encrypt+set}" = set; then
6579-
echo $ECHO_N "(cached) $ECHO_C" >&6
6580-
else
6581-
ac_func_search_save_LIBS=$LIBS
6582-
ac_cv_search_krb5_encrypt=no
6583-
cat >conftest.$ac_ext <<_ACEOF
6584-
/* confdefs.h. */
6585-
_ACEOF
6586-
cat confdefs.h >>conftest.$ac_ext
6587-
cat >>conftest.$ac_ext <<_ACEOF
6588-
/* end confdefs.h. */
6589-
6590-
/* Override any gcc2 internal prototype to avoid an error. */
6591-
#ifdef __cplusplus
6592-
extern "C"
6593-
#endif
6594-
/* We use char because int might match the return type of a gcc2
6595-
builtin and then its argument prototype would still apply. */
6596-
char krb5_encrypt ();
6597-
int
6598-
main ()
6599-
{
6600-
krb5_encrypt ();
6601-
;
6602-
return 0;
6603-
}
6604-
_ACEOF
6605-
rm -f conftest.$ac_objext conftest$ac_exeext
6606-
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
6607-
(eval $ac_link) 2>conftest.er1
6608-
ac_status=$?
6609-
grep -v '^ *+' conftest.er1 >conftest.err
6610-
rm -f conftest.er1
6611-
cat conftest.err >&5
6612-
echo "$as_me:$LINENO: \$? = $ac_status" >&5
6613-
(exit $ac_status); } &&
6614-
{ ac_try='test -z "$ac_c_werror_flag"
6615-
|| test ! -s conftest.err'
6616-
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6617-
(eval $ac_try) 2>&5
6618-
ac_status=$?
6619-
echo "$as_me:$LINENO: \$? = $ac_status" >&5
6620-
(exit $ac_status); }; } &&
6621-
{ ac_try='test -s conftest$ac_exeext'
6622-
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6623-
(eval $ac_try) 2>&5
6624-
ac_status=$?
6625-
echo "$as_me:$LINENO: \$? = $ac_status" >&5
6626-
(exit $ac_status); }; }; then
6627-
ac_cv_search_krb5_encrypt="none required"
6628-
else
6629-
echo "$as_me: failed program was:" >&5
6630-
sed 's/^/| /' conftest.$ac_ext >&5
6631-
6632-
fi
6633-
rm -f conftest.err conftest.$ac_objext \
6634-
conftest$ac_exeext conftest.$ac_ext
6635-
if test "$ac_cv_search_krb5_encrypt" = no; then
6636-
for ac_lib in krb5 'krb5 -ldes -lasn1 -lroken' crypto k5crypto; do
6637-
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
6638-
cat >conftest.$ac_ext <<_ACEOF
6639-
/* confdefs.h. */
6640-
_ACEOF
6641-
cat confdefs.h >>conftest.$ac_ext
6642-
cat >>conftest.$ac_ext <<_ACEOF
6643-
/* end confdefs.h. */
6644-
6645-
/* Override any gcc2 internal prototype to avoid an error. */
6646-
#ifdef __cplusplus
6647-
extern "C"
6648-
#endif
6649-
/* We use char because int might match the return type of a gcc2
6650-
builtin and then its argument prototype would still apply. */
6651-
char krb5_encrypt ();
6652-
int
6653-
main ()
6654-
{
6655-
krb5_encrypt ();
6656-
;
6657-
return 0;
6658-
}
6659-
_ACEOF
6660-
rm -f conftest.$ac_objext conftest$ac_exeext
6661-
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
6662-
(eval $ac_link) 2>conftest.er1
6663-
ac_status=$?
6664-
grep -v '^ *+' conftest.er1 >conftest.err
6665-
rm -f conftest.er1
6666-
cat conftest.err >&5
6667-
echo "$as_me:$LINENO: \$? = $ac_status" >&5
6668-
(exit $ac_status); } &&
6669-
{ ac_try='test -z "$ac_c_werror_flag"
6670-
|| test ! -s conftest.err'
6671-
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6672-
(eval $ac_try) 2>&5
6673-
ac_status=$?
6674-
echo "$as_me:$LINENO: \$? = $ac_status" >&5
6675-
(exit $ac_status); }; } &&
6676-
{ ac_try='test -s conftest$ac_exeext'
6677-
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6678-
(eval $ac_try) 2>&5
6679-
ac_status=$?
6680-
echo "$as_me:$LINENO: \$? = $ac_status" >&5
6681-
(exit $ac_status); }; }; then
6682-
ac_cv_search_krb5_encrypt="-l$ac_lib"
6683-
break
6684-
else
6685-
echo "$as_me: failed program was:" >&5
6686-
sed 's/^/| /' conftest.$ac_ext >&5
6687-
6688-
fi
6689-
rm -f conftest.err conftest.$ac_objext \
6690-
conftest$ac_exeext conftest.$ac_ext
6691-
done
6692-
fi
6693-
LIBS=$ac_func_search_save_LIBS
6694-
fi
6695-
echo "$as_me:$LINENO: result: $ac_cv_search_krb5_encrypt" >&5
6696-
echo "${ECHO_T}$ac_cv_search_krb5_encrypt" >&6
6697-
if test "$ac_cv_search_krb5_encrypt" != no; then
6698-
test "$ac_cv_search_krb5_encrypt" = "none required" || LIBS="$ac_cv_search_krb5_encrypt $LIBS"
6699-
6700-
else
6701-
{ { echo "$as_me:$LINENO: error: could not find function 'krb5_encrypt' required for Kerberos 5" >&5
6702-
echo "$as_me: error: could not find function 'krb5_encrypt' required for Kerberos 5" >&2;}
6703-
{ (exit 1); exit 1; }; }
6704-
fi
6705-
67066576
echo "$as_me:$LINENO: checking for library containing krb5_sendauth" >&5
67076577
echo $ECHO_N "checking for library containing krb5_sendauth... $ECHO_C" >&6
67086578
if test "${ac_cv_search_krb5_sendauth+set}" = set; then

‎configure.in

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $PostgreSQL: pgsql/configure.in,v 1.467 2006/06/18 18:30:20 tgl Exp $
2+
dnl $PostgreSQL: pgsql/configure.in,v 1.468 2006/07/11 16:14:50 tgl Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -671,8 +671,6 @@ if test "$with_krb5" = yes ; then
671671
if test "$PORTNAME" != "win32"; then
672672
AC_SEARCH_LIBS(com_err, [krb5 'krb5 -ldes -lasn1 -lroken' com_err], [],
673673
[AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])])
674-
AC_SEARCH_LIBS(krb5_encrypt, [krb5 'krb5 -ldes -lasn1 -lroken' crypto k5crypto], [],
675-
[AC_MSG_ERROR([could not find function 'krb5_encrypt' required for Kerberos 5])])
676674
AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -ldes -lasn1 -lroken'], [],
677675
[AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5])])
678676
else

0 commit comments

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