diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2006-09-27 11:03:22 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2006-09-27 11:03:22 +0000 |
| commit | 6bdaea253b87da72e70242282100bb72818f3206 (patch) | |
| tree | 2224b15280814220df5a7067fa2b4098021631e6 /acinclude.m4 | |
| parent | 9a47cb27c711c0c37ecb0ffbb97c1c3958e4173f (diff) | |
Change some messages when ucd snmp is found but --with-ssl
is missing. Also I changed the behaviour to just disable
ucd snmp in case it was requested but no --with-ssl was
given instead of bailing out with an error.
svn path=/trunk/; revision=19335
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 3b9db75181..b9624a537a 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1118,7 +1118,7 @@ AC_DEFUN([AC_WIRESHARK_NETSNMP_CHECK], else NETSNMPCNFIG=$netsnmpconfig if test ! -x $NETSNMPCONFIG -o ! -f $NETSNMPCONFIG ; then - ETSNMPCONFIG=$netsnmpconfig/bin/net-snmp-config + NETSNMPCONFIG=$netsnmpconfig/bin/net-snmp-config if test ! -x $NETSNMPCONFIG -o ! -f $NETSNMPCONFIG ; then AC_MSG_ERROR(Invalid net-snmp-config: $netsnmpconfig) fi @@ -1282,7 +1282,8 @@ AC_DEFUN([AC_WIRESHARK_UCDSNMP_CHECK], # them they'll need to specify # --with-ssl. # - AC_MSG_ERROR([UCD SNMP requires -lcrypto but --with-ssl not specified]) + found_sprint_realloc_objid=yesnocrypto + AC_MSG_RESULT([UCD SNMP requires -lcrypto but --with-ssl was not specified - disabling UCD SNMP.]) ]) fi ]) @@ -1296,7 +1297,9 @@ AC_DEFUN([AC_WIRESHARK_UCDSNMP_CHECK], # specify "--with-ssl". # if test "$found_snmp_sprint_realloc_objid" = no; then - AC_MSG_ERROR([UCD SNMP header files found, but sprint_realloc_objid not found in SNMP library.]) + AC_MSG_RESULT([UCD SNMP header files found, but sprint_realloc_objid not found in SNMP library - disabling UCD SNMP.]) + elif test "$found_snmp_sprint_realloc_objid" != yes -a "x$want_ucdsnmp" = "xyes"; then + AC_MSG_ERROR(UCD SNMP requested but fails to build) fi # |