Fix configure to look for des_cbc_encrypt in -ldes.

I did not commit all 7K lines of diff that autoconf produced because
of the changed line numbers, just the relevant ones.

3 files changed, 75 insertions, 3 deletions

diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index 0f7953babd4..fe248dd06d3 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2004/03/29 16:23:14 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2004/04/22 16:50:02 christos Exp $
 
 DISTNAME=	net-snmp-5.0.9
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=net-snmp/} \
 		ftp://ftp.net-smnp.org/pub/sourceforge/net-snmp/
diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo
index 6d0b5c201c3..38df082f8f4 100644
--- a/net/net-snmp/distinfo
+++ b/net/net-snmp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2004/04/14 21:48:49 danw Exp $
+$NetBSD: distinfo,v 1.8 2004/04/22 16:50:02 christos Exp $
 
 SHA1 (net-snmp-5.0.9.tar.gz) = bb27bdf38da96833a3fa55f8c6a14732ab2c1991
 Size (net-snmp-5.0.9.tar.gz) = 2345822 bytes
@@ -7,3 +7,4 @@ SHA1 (patch-ab) = 0c6c2cd591b7264da102e7182413a5f7ed02d198
 SHA1 (patch-ac) = 23696f87cf5669e52ca9c70d4a7f30f649574083
 SHA1 (patch-ad) = 947bc9d8d6190584e9c7f93c2b4aeda63fd5139c
 SHA1 (patch-ae) = efc77e7985e9ac44c99e35015e2be55b0601dd4e
+SHA1 (patch-af) = 83e3e7f27865d2423b03fc1d967319bc104c877d
diff --git a/net/net-snmp/patches/patch-af b/net/net-snmp/patches/patch-af
new file mode 100644
index 00000000000..1ab2777bd94
--- /dev/null
+++ b/net/net-snmp/patches/patch-af
@@ -0,0 +1,71 @@
+$NetBSD: patch-af,v 1.1 2004/04/22 16:50:02 christos Exp $
+
+--- configure.in.orig	Sat Sep  6 02:41:25 2003
++++ configure.in	Thu Apr 22 11:26:53 2004
+@@ -1362,6 +1362,8 @@
+     AC_CHECK_FUNCS(AES_cfb128_encrypt)
+ fi
+ 
++AC_CHECK_LIB(des, des_cbc_encrypt)
++
+ dnl Check for libraries that the agent needs
+ dnl saving old libraries
+ NONAGENTLIBS=$LIBS
+
+--- configure.orig	Sat Sep  6 03:22:58 2003
++++ configure	Thu Apr 22 11:26:56 2004
+@@ -8524,6 +8524,54 @@
+ 
+ fi
+ 
++echo $ac_n "checking for des_cbc_encrypt in -ldes""... $ac_c" 1>&6
++echo "configure:8529: checking for des_cbc_encrypt in -ldes" >&5
++ac_lib_var=`echo des'_'des_cbc_encrypt | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-ldes  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 8537 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char des_cbc_encrypt();
++
++int main() {
++des_cbc_encrypt()
++; return 0; }
++EOF
++if { (eval echo configure:8548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_lib=HAVE_LIB`echo des | sed -e 's/[^a-zA-Z0-9_]/_/g' \
++    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_lib 1
++EOF
++
++  LIBS="-ldes $LIBS"
++
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++
+ NONAGENTLIBS=$LIBS
+ 
+ _cppflags="${CPPFLAGS}"