diff options
| author | Bruce M Simpson <bms@FreeBSD.org> | 2003-12-08 16:20:12 +0000 |
|---|---|---|
| committer | Bruce M Simpson <bms@FreeBSD.org> | 2003-12-08 16:20:12 +0000 |
| commit | 8e493fa8ca60b06c66b4fcace8d1cb257b086cee (patch) | |
| tree | fc2dc6b59a5343bb0072a9ef004f065784e8f0e1 /net/quagga | |
| parent | a2d84b38118a1c5a73fc4f676328f1e3f1a44f95 (diff) | |
Fix the net-snmp check in the configure.ac script. Previously, the check would
fail silently and the package would build anyway. This should fix support
for linking against net-snmp for SNMP support.
Notes
Notes:
svn path=/head/; revision=95383
Diffstat (limited to 'net/quagga')
| -rw-r--r-- | net/quagga/files/patch-configure.ac | 41 |
1 files changed, 32 insertions, 9 deletions
diff --git a/net/quagga/files/patch-configure.ac b/net/quagga/files/patch-configure.ac index aca88e392c0f..030a86a19746 100644 --- a/net/quagga/files/patch-configure.ac +++ b/net/quagga/files/patch-configure.ac @@ -1,20 +1,43 @@ ---- configure.ac.orig Thu Sep 25 21:27:36 2003 -+++ configure.ac Thu Sep 25 21:31:17 2003 -@@ -755,6 +755,17 @@ +--- configure.ac.orig Sun Nov 2 04:12:19 2003 ++++ configure.ac Wed Dec 3 02:28:37 2003 +@@ -724,7 +724,7 @@ + dnl AC_CHECK_LIB(snmp, asn_parse_int, HAVE_SNMP=yes) + if test "${HAVE_SNMP}" = ""; then + old_libs="${LIBS}" +- LIBS="-L/usr/lib" ++ LIBS="-L/usr/lib -L/usr/local/lib" + unset ac_cv_lib_snmp_asn_parse_int + AC_CHECK_LIB(crypto, main, NEED_CRYPTO=yes, ) + if test "${NEED_CRYPTO}" = ""; then +@@ -765,7 +765,7 @@ + fi + + if test "${HAVE_SNMP}" = "yes"; then +- for ac_snmp in /usr/include/net-snmp/library/asn1.h /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/include/ucd-snmp/asn1.h /usr/local/include/ucd-snmp/asn1.h /usr/local/include/net-snmp/library/asn1.h /dev/null + do + test -f "${ac_snmp}" && break + done +@@ -782,6 +782,13 @@ LIBS="${LIBS} -lsnmp" fi ;; + /usr/local/include/net-snmp/*) + AC_DEFINE(HAVE_SNMP,,SNMP) -+ AC_DEFINE(HAVE_NET_SNMP,,SNMP) ++ AC_DEFINE(HAVE_NETSNMP,,SNMP) + AC_DEFINE(UCD_COMPATIBLE,,SNMP) + CFLAGS="${CFLAGS} -I/usr/local/include -I/usr/local/include/net-snmp -I/usr/local/include/net-snmp/library" -+ if test"{HAVE_NETSNMP}" = "yes"; then -+ LIBS="${LIBS} -L/usr/local/lib -lnetsnmp" -+ else -+ LIBS="${LIBS} -L/usr/local/lib -lsnmp" -+ fi ++ LIBS="${LIBS} -L/usr/local/lib -lnetsnmp" + ;; /usr/include/ucd-snmp/*) AC_DEFINE(HAVE_SNMP,,SNMP) CFLAGS="${CFLAGS} -I/usr/include/ucd-snmp" +@@ -794,7 +801,7 @@ + ;; + /usr/local/include/net-snmp/*) + AC_DEFINE(HAVE_SNMP,,SNMP) +- AC_DEFINE(HAVE_NET_SNMP,,SNMP) ++ AC_DEFINE(HAVE_NETSNMP,,SNMP) + AC_DEFINE(UCD_COMPATIBLE,,SNMP) + CFLAGS="${CFLAGS} -I/usr/local/include/net-snmp" + LIBS="${LIBS} -L/usr/local/lib -lnetsnmp" |