8b348582f0
Maintainer timeout. I do not see how this worked in the first place without smux support.
115 lines
4.6 KiB
Plaintext
115 lines
4.6 KiB
Plaintext
$OpenBSD: patch-configure,v 1.6 2004/10/13 01:58:14 danh Exp $
|
|
--- configure.orig Fri Jun 21 17:04:21 2002
|
|
+++ configure Fri Oct 8 13:18:08 2004
|
|
@@ -6142,13 +6142,13 @@ if test "${enable_snmp}" = "yes";then
|
|
old_libs="${LIBS}"
|
|
LIBS="-L/usr/local/lib"
|
|
unset ac_cv_lib_snmp_asn_parse_int
|
|
- echo "$as_me:$LINENO: checking for asn_parse_int in -lsnmp" >&5
|
|
-echo $ECHO_N "checking for asn_parse_int in -lsnmp... $ECHO_C" >&6
|
|
+ echo "$as_me:$LINENO: checking for asn_parse_int in -lnetsnmp" >&5
|
|
+echo $ECHO_N "checking for asn_parse_int in -lnetsnmp... $ECHO_C" >&6
|
|
if test "${ac_cv_lib_snmp_asn_parse_int+set}" = set; then
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lsnmp $LIBS"
|
|
+LIBS="-lnetsnmp -lm $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
#line $LINENO "configure"
|
|
#include "confdefs.h"
|
|
@@ -6257,13 +6257,13 @@ if test $ac_cv_lib_crypto_main = yes; th
|
|
fi
|
|
|
|
if test "${NEED_CRYPTO}" = ""; then
|
|
- echo "$as_me:$LINENO: checking for asn_parse_int in -lsnmp" >&5
|
|
-echo $ECHO_N "checking for asn_parse_int in -lsnmp... $ECHO_C" >&6
|
|
+ echo "$as_me:$LINENO: checking for asn_parse_int in -lnetsnmp" >&5
|
|
+echo $ECHO_N "checking for asn_parse_int in -lnetsnmp... $ECHO_C" >&6
|
|
if test "${ac_cv_lib_snmp_asn_parse_int+set}" = set; then
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lsnmp $LIBS"
|
|
+LIBS="-lnetsnmp -lm $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
#line $LINENO "configure"
|
|
#include "confdefs.h"
|
|
@@ -6317,13 +6317,13 @@ if test $ac_cv_lib_snmp_asn_parse_int =
|
|
fi
|
|
|
|
else
|
|
- echo "$as_me:$LINENO: checking for asn_parse_int in -lsnmp" >&5
|
|
-echo $ECHO_N "checking for asn_parse_int in -lsnmp... $ECHO_C" >&6
|
|
+ echo "$as_me:$LINENO: checking for asn_parse_int in -lnetsnmp" >&5
|
|
+echo $ECHO_N "checking for asn_parse_int in -lnetsnmp... $ECHO_C" >&6
|
|
if test "${ac_cv_lib_snmp_asn_parse_int+set}" = set; then
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lsnmp "-lcrypto" $LIBS"
|
|
+LIBS="-lnetsnmp -lcrypto -lm $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
#line $LINENO "configure"
|
|
#include "confdefs.h"
|
|
@@ -6383,13 +6383,13 @@ fi
|
|
if test "${HAVE_SNMP}" = ""; then
|
|
old_libs="${LIBS}"
|
|
LIBS="-L/usr/local/lib"
|
|
- echo "$as_me:$LINENO: checking for asn_parse_int in -lsnmp" >&5
|
|
-echo $ECHO_N "checking for asn_parse_int in -lsnmp... $ECHO_C" >&6
|
|
+ echo "$as_me:$LINENO: checking for asn_parse_int in -lnetsnmp" >&5
|
|
+echo $ECHO_N "checking for asn_parse_int in -lnetsnmp... $ECHO_C" >&6
|
|
if test "${ac_cv_lib_snmp_asn_parse_int+set}" = set; then
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lsnmp $LIBS"
|
|
+LIBS="-lnetsnmp -lm $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
#line $LINENO "configure"
|
|
#include "confdefs.h"
|
|
@@ -6445,26 +6445,26 @@ fi
|
|
LIBS="${old_libs}"
|
|
fi
|
|
if test "${HAVE_SNMP}" = "yes"; then
|
|
- for ac_snmp in /usr/include/ucd-snmp/asn1.h /usr/local/include/ucd-snmp/asn1.h /dev/null
|
|
+ for ac_snmp in /usr/include/net-snmp/library/asn1.h /usr/local/include/net-snmp/library/asn1.h /dev/null
|
|
do
|
|
test -f "${ac_snmp}" && break
|
|
done
|
|
case ${ac_snmp} in
|
|
- /usr/include/ucd-snmp/*)
|
|
+ /usr/include/net-snmp/*)
|
|
cat >>confdefs.h <<\_ACEOF
|
|
#define HAVE_SNMP 1
|
|
_ACEOF
|
|
|
|
- CFLAGS="${CFLAGS} -I/usr/include/ucd-snmp"
|
|
- LIBS="${LIBS} -lsnmp"
|
|
+ CFLAGS="${CFLAGS} -I/usr/include/net-snmp"
|
|
+ LIBS="${LIBS} -lnetsnmp -lm"
|
|
;;
|
|
- /usr/local/include/ucd-snmp/*)
|
|
+ /usr/local/include/net-snmp/*)
|
|
cat >>confdefs.h <<\_ACEOF
|
|
#define HAVE_SNMP 1
|
|
_ACEOF
|
|
|
|
- CFLAGS="${CFLAGS} -I/usr/local/include/ucd-snmp"
|
|
- LIBS="${LIBS} -L/usr/local/lib -lsnmp"
|
|
+ CFLAGS="${CFLAGS} -I/usr/local/include"
|
|
+ LIBS="${LIBS} -L/usr/local/lib -lnetsnmp -lm"
|
|
;;
|
|
esac
|
|
if test "${NEED_CRYPTO}" = "yes"; then
|
|
@@ -7004,7 +7004,7 @@ fi
|
|
echo "$as_me:$LINENO: result: $ac_cv_htonl_works" >&5
|
|
echo "${ECHO_T}$ac_cv_htonl_works" >&6
|
|
|
|
-ac_config_files="$ac_config_files Makefile lib/Makefile zebra/Makefile ripd/Makefile ripngd/Makefile bgpd/Makefile ospfd/Makefile ospf6d/Makefile vtysh/Makefile doc/Makefile"
|
|
+ac_config_files="$ac_config_files Makefile lib/Makefile zebra/Makefile ripd/Makefile ripngd/Makefile bgpd/Makefile ospfd/Makefile ospf6d/Makefile vtysh/Makefile doc/Makefile doc/bgpd.8 doc/ospf6d.8 doc/ospfd.8 doc/ripd.8 doc/ripngd.8 doc/vtysh.1 doc/zebra.8"
|
|
cat >confcache <<\_ACEOF
|
|
# This file is a shell script that caches the results of configure
|
|
# tests run on this system so they can be shared between configure
|