dns/bind916/files/patch-configure

   1 Fixup gssapi and db detection.
   2
   3 --- configure.orig      2020-03-11 16:46:53 UTC
   4 +++ configure
   5 @@ -17437,27 +17437,9 @@ done
   6                 # problems start to show up.
   7                 saved_libs="$LIBS"
   8                 for TRY_LIBS in \
   9 -                   "-lgssapi_krb5" \
  10 -                   "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" \
  11 -                   "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lresolv" \
  12 -                   "-lgssapi" \
  13 -                   "-lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err" \
  14 -                   "-lgssapi -lkrb5 -lcrypt -lasn1 -lroken -lcom_err" \
  15 -                   "-lgssapi -lkrb5 -lgssapi_krb5 -lcrypt -lasn1 -lroken -lcom_err" \
  16 -                   "-lgssapi -lkrb5 -lhx509 -lcrypt -lasn1 -lroken -lcom_err" \
  17 -                   "-lgss -lkrb5"
  18 +                   "$($KRB5CONFIG gssapi --libs)"; \
  19                 do
  20 -                   # Note that this does not include $saved_libs, because
  21 -                   # on FreeBSD machines this configure script has added
  22 -                   # -L/usr/local/lib to LIBS, which can make the
  23 -                   # -lgssapi_krb5 test succeed with shared libraries even
  24 -                   # when you are trying to build with KTH in /usr/lib.
  25 -                   if test "/usr" = "$use_gssapi"
  26 -                   then
  27 -                           LIBS="$TRY_LIBS $ISC_OPENSSL_LIBS"
  28 -                   else
  29 -                           LIBS="-L$use_gssapi/lib $TRY_LIBS $ISC_OPENSSL_LIBS"
  30 -                   fi
  31 +                   LIBS="$TRY_LIBS"
  32                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5
  33  $as_echo_n "checking linking as $TRY_LIBS... " >&6; }
  34                     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  35 @@ -17500,47 +17482,7 @@ $as_echo "no" >&6; } ;;
  36                 no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;;
  37                 esac
  38
  39 -               #
  40 -               # XXXDCL Major kludge.  Tries to cope with KTH in /usr/lib
  41 -               # but MIT in /usr/local/lib and trying to build with KTH.
  42 -               # /usr/local/lib can end up earlier on the link lines.
  43 -               # Like most kludges, this one is not only inelegant it
  44 -               # is also likely to be the wrong thing to do at least as
  45 -               # many times as it is the right thing.  Something better
  46 -               # needs to be done.
  47 -               #
  48 -               if test "/usr" = "$use_gssapi" -a \
  49 -                       -f /usr/local/lib/libkrb5.a; then
  50 -                   FIX_KTH_VS_MIT=yes
  51 -               fi
  52 -
  53 -               case "$FIX_KTH_VS_MIT" in
  54 -               yes)
  55 -                   case "$enable_static_linking" in
  56 -                   yes) gssapi_lib_suffix=".a"  ;;
  57 -                   *)   gssapi_lib_suffix=".so" ;;
  58 -                   esac
  59 -
  60 -                   for lib in $LIBS; do
  61 -                       case $lib in
  62 -                       -L*)
  63 -                           ;;
  64 -                       -l*)
  65 -                           new_lib=`echo $lib |
  66 -                                    sed -e s%^-l%$use_gssapi/lib/lib% \
  67 -                                        -e s%$%$gssapi_lib_suffix%`
  68 -                           NEW_LIBS="$NEW_LIBS $new_lib"
  69 -                           ;;
  70 -                       *)
  71 -                          as_fn_error $? "KTH vs MIT Kerberos confusion!" "$LINENO" 5
  72 -                           ;;
  73 -                       esac
  74 -                   done
  75 -                   LIBS="$NEW_LIBS"
  76 -                   ;;
  77 -               esac
  78 -
  79 -               DST_GSSAPI_INC="-I$use_gssapi/include"
  80 +               DST_GSSAPI_INC="$($KRB5CONFIG gssapi --cflags)"
  81                 DNS_GSSAPI_LIBS="$LIBS"
  82
  83                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
  84 @@ -23049,7 +22991,7 @@ $as_echo "" >&6; }
  85                         # Check other locations for includes.
  86                         # Order is important (sigh).
  87
  88 -                       bdb_incdirs="/db53 /db51 /db48 /db47 /db46 /db45 /db44 /db43 /db42 /db41 /db4 /db"
  89 +                       bdb_incdirs="/db6 /db5 /db48"
  90                         # include a blank element first
  91                         for d in "" $bdb_incdirs
  92                         do