freeradius-netsnmp.patch

   1 --- freeradius-0.9.3/acinclude.m4.orig  2004-05-08 16:51:53.000000000 +0200
   2 +++ freeradius-0.9.3/acinclude.m4       2004-05-08 17:06:49.355111483 +0200
   3 @@ -157,12 +157,13 @@
   4  #ifdef HAVE_UNISTD_H
   5  #include <unistd.h>
   6  #endif
   7 -#include <ucd-snmp/asn1.h>
   8 -#include <ucd-snmp/snmp.h>
   9 -#include <ucd-snmp/snmp_impl.h>],
  10 +#include <net-snmp/net-snmp-config.h>
  11 +#include <net-snmp/library/asn1.h>
  12 +#include <net-snmp/library/snmp.h>
  13 +#include <net-snmp/library/snmp_impl.h>],
  14                 [ int a = 1;],
  15 -               SNMP_INCLUDE="";ucdsnmp=yes,
  16 -               ucdsnmp=)
  17 +               SNMP_INCLUDE="";netsnmp=yes,
  18 +               netsnmp=)
  19
  20  dnl #
  21  dnl #  If not, look for it in a number of directories and in ucd-snmp.
  22 @@ -187,22 +188,23 @@
  23  #ifdef HAVE_UNISTD_H
  24  #include <unistd.h>
  25  #endif
  26 -#include <ucd-snmp/asn1.h>
  27 -#include <ucd-snmp/snmp.h>
  28 -#include <ucd-snmp/snmp_impl.h>],
  29 +#include <net-snmp/net-snmp-config.h>
  30 +#include <net-snmp/library/asn1.h>
  31 +#include <net-snmp/library/snmp.h>
  32 +#include <net-snmp/library/snmp_impl.h>],
  33                     [ int a = 1;],
  34 -                   SNMP_INCLUDE="-I$try";ucdsnmp=yes,
  35 -                   ucdsnmp=)
  36 -    if test "x$ucdsnmp" != "x"; then
  37 +                   SNMP_INCLUDE="-I$try";netsnmp=yes,
  38 +                   netsnmp=)
  39 +    if test "x$netsnmp" != "x"; then
  40        break;
  41      fi
  42    done
  43    CFLAGS="$old_CFLAGS"
  44  fi
  45
  46 -if test "x$ucdsnmp" = "x"; then
  47 +if test "x$netsnmp" = "x"; then
  48    old_CFLAGS="$CFLAGS"
  49 -  for try in /usr/include/ucd-snmp /usr/local/include/ucd-snmp $snmp_include_dir; do
  50 +  for try in /usr/include/net-snmp /usr/local/include/net-snmp $snmp_include_dir; do
  51      CFLAGS="$old_CFLAGS -I$try"
  52  dnl #
  53  dnl #  First, see if we can build it WITHOUT using any special includes and without ucd-snmp
  54 @@ -227,9 +229,9 @@
  55  #include <snmp.h>
  56  #include <snmp_impl.h>],
  57                 [ int a = 1;],
  58 -               SNMP_INCLUDE="";ucdsnmp=no,
  59 -               ucdsnmp=)
  60 -    if test "x$ucdsnmp" != "x"; then
  61 +               SNMP_INCLUDE="";netsnmp=no,
  62 +               netsnmp=)
  63 +    if test "x$netsnmp" != "x"; then
  64        break;
  65      fi
  66    done
  67 @@ -239,9 +239,9 @@
  68  dnl #
  69  dnl #  If not, look for it in a number of directories and without ucd-snmp
  70  dnl #
  71 -if test "x$ucdsnmp" = "x"; then
  72 +if test "x$netsnmp" = "x"; then
  73    old_CFLAGS="$CFLAGS"
  74 -  for try in /usr/include/ucd-snmp /usr/local/include/ucd-snmp $snmp_include_dir; do
  75 +  for try in /usr/include/net-snmp /usr/local/include/net-snmp $snmp_include_dir; do
  76      CFLAGS="$old_CFLAGS -I$try"
  77      AC_TRY_COMPILE([
  78  #ifdef HAVE_SYS_TYPES_H
  79 @@ -263,21 +263,21 @@
  80  #include <snmp.h>
  81  #include <snmp_impl.h>],
  82                     [ int a = 1;],
  83 -                   SNMP_INCLUDE="-I$try";ucdsnmp=no,
  84 -                   ucdsnmp=)
  85 -    if test "x$ucdsnmp" != "x"; then
  86 +                   SNMP_INCLUDE="-I$try";netsnmp=no,
  87 +                   netsnmp=)
  88 +    if test "x$netsnmp" != "x"; then
  89        break;
  90      fi
  91    done
  92    CFLAGS="$old_CFLAGS"
  93  fi
  94
  95 -if test "x$ucdsnmp" = "x"; then
  96 +if test "x$netsnmp" = "x"; then
  97    AC_MSG_RESULT(no)
  98  else
  99 -  if test "x$ucdsnmp" = "xyes"; then
 100 -    AC_MSG_RESULT((ucd-snmp)yes)
 101 -    AC_DEFINE(HAVE_UCD_SNMP_ASN1_SNMP_SNMPIMPL_H)
 102 +  if test "x$netsnmp" = "xyes"; then
 103 +    AC_MSG_RESULT((net-snmp)yes)
 104 +    AC_DEFINE(HAVE_NET_SNMP_LIBRARY_ASN1_SNMP_SNMPIMPL_H)
 105    else
 106      AC_MSG_RESULT(yes)
 107      AC_DEFINE(HAVE_ASN1_SNMP_SNMPIMPL_H)
 108 @@ -285,24 +285,24 @@
 109  dnl #
 110  dnl #  Now do the same thing, looking for the SNMP library directory
 111  dnl #
 112 -  AC_MSG_CHECKING([for snmp_build_var_op in -lsnmp])
 113 +  AC_MSG_CHECKING([for snmp_build_var_op in -lnetsnmp])
 114
 115  dnl #
 116  dnl #  First, see if we can build it WITHOUT using any special includes
 117  dnl #
 118    old_LIBS="$LIBS"
 119 -  LIBS="$old_LIBS -lsnmp"
 120 +  LIBS="$old_LIBS -lnetsnmp"
 121    AC_TRY_LINK([extern char snmp_build_var_op();],
 122                [ snmp_build_var_op()],
 123 -              SNMP_LIBS="-lsnmp",
 124 +              SNMP_LIBS="-lnetsnmp",
 125                SNMP_LIBS=)
 126
 127    if test "x$SNMP_LIBS" = "x"; then
 128      for try in /usr/lib /usr/local/lib /usr/local/snmp/lib $snmp_lib_dir; do
 129 -      LIBS="$old_LIBS -L$try -lsnmp"
 130 +      LIBS="$old_LIBS -L$try -lnetsnmp"
 131        AC_TRY_LINK([extern char snmp_build_var_op();],
 132                    [ snmp_build_var_op()],
 133 -                  SNMP_LIBS="-L$try -lsnmp",
 134 +                  SNMP_LIBS="-L$try -lnetsnmp",
 135                    SNMP_LIBS=)
 136        if test "x$SNMP_LIBS" != "x"; then
 137          break;
 138 @@ -311,10 +311,10 @@
 139  dnl   #  That didn't work.  Try adding the '-lcrypto' line.
 140  dnl   #  Some SNMP libraries are linked against SSL...
 141  dnl   #
 142 -      LIBS="$old_LIBS -L$try -lsnmp -lcrypto"
 143 +      LIBS="$old_LIBS -L$try -lnetsnmp -lcrypto"
 144        AC_TRY_LINK([extern char snmp_build_var_op();],
 145                    [ snmp_build_var_op()],
 146 -                  SNMP_LIBS="-L$try -lsnmp -lcrypto",
 147 +                  SNMP_LIBS="-L$try -lnetsnmp -lcrypto",
 148                    SNMP_LIBS=)
 149        if test "x$SNMP_LIBS" != "x"; then
 150          break;
 151 --- freeradius-0.9.3/src/include/radius_snmp.h.orig     2002-08-16 22:15:22.000000000 +0200
 152 +++ freeradius-0.9.3/src/include/radius_snmp.h  2004-05-08 17:08:33.433163385 +0200
 153 @@ -9,10 +9,11 @@
 154  #include       <asn1.h>
 155  #include       <snmp.h>
 156  #include       <snmp_impl.h>
 157 -#elif HAVE_UCD_SNMP_ASN1_SNMP_SNMPIMPL_H
 158 -#include       <ucd-snmp/asn1.h>
 159 -#include       <ucd-snmp/snmp.h>
 160 -#include       <ucd-snmp/snmp_impl.h>
 161 +#elif HAVE_NET_SNMP_LIBRARY_ASN1_SNMP_SNMPIMPL_H
 162 +#include       <net-snmp/net-snmp-config.h>
 163 +#include       <net-snmp/library/asn1.h>
 164 +#include       <net-snmp/library/snmp.h>
 165 +#include       <net-snmp/library/snmp_impl.h>
 166  #endif
 167
 168  #include        "smux.h"
 169 --- freeradius-0.9.3/acconfig.h.orig    2003-06-22 12:04:21.000000000 +0200
 170 +++ freeradius-0.9.3/acconfig.h 2004-05-08 17:11:04.883863944 +0200
 171 @@ -69,8 +69,8 @@
 172  /* Include user collision code*/
 173  #undef WITH_USERCOLLIDE
 174
 175 -/* Define if you have the <ucd-snmp/asn1.h>, <ucd-snmp/snmp_impl.h> and <ucd-snmp/snmp.h> header file.  */
 176 -#undef HAVE_UCD_SNMP_ASN1_SNMP_SNMPIMPL_H
 177 +/* Define if you have the <net-snmp/library/asn1.h>, <net-snmp/library/snmp_impl.h> and <net-snmp/library/snmp.h> header file.  */
 178 +#undef HAVE_NET_SNMP_LIBRARY_ASN1_SNMP_SNMPIMPL_H
 179
 180  /* Define if you have the <asn1.h>, <snmp_impl.h> and <snmp.h> header file.  */
 181  #undef HAVE_ASN1_SNMP_SNMPIMPL_H