net-snmp-acfix.patch

   1 --- net-snmp-5.4.1/configure.ac 2007-09-08 16:13:11.531748373 +0200
   2 +++ net-snmp-5.4.1-ac/configure.ac      2007-11-14 20:58:16.361317122 +0200
   3 @@ -1726,16 +1726,18 @@
   4  rebuilt_new_with_security=
   5  already_checked_krb5=no
   6
   7 +KRB5_LIBS=
   8 +AC_SUBST(KRB5_LIBS)
   9  for sec in $new_with_security
  10  do
  11    if test "x$sec" = "xksm" -a "xyes" = "x$already_checked_krb5"; then
  12      continue
  13    fi
  14 -  already_checked_krb5=yes
  15
  16    if test x$sec != xksm; then
  17      rebuilt_new_with_security="$rebuilt_new_with_security $sec"
  18    else
  19 +    already_checked_krb5=yes
  20      if test no = $trykrb5; then
  21        AC_MSG_NOTICE([configured not to use krb5. disabling ksm])
  22        continue
  23 @@ -1745,7 +1747,7 @@
  24
  25      if test no != $krb5_config; then
  26        CPPFLAGS="$CPPFLAGS `$krb5_config --cflags`"
  27 -      LIBS="$LIBS `$krb5_config --libs`"
  28 +      KRB5_LIBS="`$krb5_config --libs`"
  29      elif test $krb5path != no; then
  30        AC_ADD_SEARCH_PATH($krb5path)
  31      else
  32 @@ -1782,29 +1784,35 @@
  33      if test $ac_cv_heimdal = yes; then
  34        AC_DEFINE(NETSNMP_USE_KERBEROS_HEIMDAL)
  35        if test no = $krb5_config; then
  36 -       LIBS="$LIBS -lkrb5 -lasn1 -lcom_err -lroken"
  37 +       KRB5_LIBS="-lkrb5 -lasn1 -lcom_err -lroken"
  38        fi
  39      elif test no = $krb5_config; then
  40 -       LIBS="$LIBS -lkrb5 -lcom_err"
  41 +       KRB5_LIBS="-lkrb5 -lcom_err"
  42      fi
  43
  44 +    old_LIBS="$LIBS"
  45 +    LIBS="$LIBS $KRB5_LIBS"
  46      AC_MSG_CHECKING([to see which crypto API we need to use])
  47      AC_CHECK_FUNC(krb5_c_encrypt,[
  48 -    AC_CACHE_VAL(ac_cv_NETSNMP_USE_KERBEROS_MIT,
  49 -      AC_CHECK_LIB(k5crypto, krb5_init_context,
  50 -       ac_cv_NETSNMP_USE_KERBEROS_MIT=yes, ac_cv_MIT_NEW_CRYPTo=no
  51 -      )
  52 -    )
  53 +       AC_CHECK_LIB(k5crypto, krb5_init_context,
  54 +                    ac_cv_MIT_NEW_CRYPTo=yes, ac_cv_MIT_NEW_CRYPTo=no
  55 +       )
  56
  57 -    if test yes = $ac_cv_NETSNMP_USE_KERBEROS_MIT; then
  58 -      AC_MSG_RESULT(new MIT crypto API)
  59 +    if test yes = $ac_cv_MIT_NEW_CRYPTo; then
  60        AC_DEFINE(NETSNMP_USE_KERBEROS_MIT)
  61 +      AC_MSG_RESULT(new MIT crypto API)
  62        if test no = $krb5_config; then
  63 -       LIBS="$LIBS -lk5crypto"
  64 +       KRB5_LIBS="$LIBS -lk5crypto"
  65 +      else
  66 +       CFLAGS="$CFLAGS `$krb5_config --cflags`"
  67 +       KRB5_LIBS="$LIBS `$krb5_config --libs`"
  68        fi
  69      else
  70 -      AC_MSG_RESULT(old MIT crypto API)])
  71 +      AC_MSG_RESULT(old MIT crypto API)
  72      fi
  73 +    ])
  74 +    LNETSNMPLIBS="$LNETSNMPLIBS $KRB5_LIBS"
  75 +    LIBS="$old_LIBS"
  76    fi
  77  done
  78