postgres.git / summary / log / commit / refs

commit    66bbc2fdd5963bc40cc741e3f9a53a4a365e10bc
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Mon Mar 26 02:37:17 2007 +0000
First released in: 8.3.0

    Add -lcrypto as one of the possible link dependencies of libkrb5.
    Per report from Jim Rosenberg.  This possibly should get back-patched,
    but I'm a bit suspicious of it still because of the lack of prior reports.


 configure    | 4 ++--
 configure.in | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index 71dbaee0aa4..5e242bb8d5e 100755
--- a/configure
+++ b/configure
@@ -6675,7 +6675,7 @@ fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 if test "$ac_cv_search_com_err" = no; then
-  for ac_lib in krb5 'krb5 -ldes -lasn1 -lroken' com_err; do
+  for ac_lib in krb5 'krb5 -lcrypto -ldes -lasn1 -lroken' com_err; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -6805,7 +6805,7 @@ fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 if test "$ac_cv_search_krb5_sendauth" = no; then
-  for ac_lib in krb5 'krb5 -ldes -lasn1 -lroken'; do
+  for ac_lib in krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
diff --git a/configure.in b/configure.in
index 273f79bf5f5..bc25a07d78f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $PostgreSQL: pgsql/configure.in,v 1.503 2007/03/21 14:39:23 mha Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.504 2007/03/26 02:37:16 tgl Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -732,9 +732,9 @@ fi
 
 if test "$with_krb5" = yes ; then
   if test "$PORTNAME" != "win32"; then
-     AC_SEARCH_LIBS(com_err, [krb5 'krb5 -ldes -lasn1 -lroken' com_err], [],
+     AC_SEARCH_LIBS(com_err, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken' com_err], [],
                     [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])])
-     AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -ldes -lasn1 -lroken'], [],
+     AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
                     [AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5])])
   else
      AC_SEARCH_LIBS(com_err, 'comerr32 -lkrb5_32', [],


[parent: 287ed68dd2a8]