aboutsummaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>1999-11-29 04:31:05 +0000
committerGuy Harris <guy@alum.mit.edu>1999-11-29 04:31:05 +0000
commit1678a318dab6c62a93581eb2c784b5e4e0b97906 (patch)
treece2878251d009f9342fc8455252f69e507b87542 /gtk
parent548be624aee80e39f588868256164e57555874bc (diff)
Get version number information for CMU SNMP.
svn path=/trunk/; revision=1142
Diffstat (limited to 'gtk')
-rw-r--r--gtk/main.c20
1 files changed, 15 insertions, 5 deletions
diff --git a/gtk/main.c b/gtk/main.c
index bad08d471a..9b7359e050 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1,6 +1,6 @@
/* main.c
*
- * $Id: main.c,v 1.51 1999/11/29 03:56:26 gram Exp $
+ * $Id: main.c,v 1.52 1999/11/29 04:30:21 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -73,9 +73,15 @@
# include "snprintf.h"
#endif
+#if defined(HAVE_UCD_SNMP_SNMP_H)
#ifdef HAVE_UCD_SNMP_VERSION_H
#include <ucd-snmp/version.h>
-#endif
+#endif /* HAVE_UCD_SNMP_VERSION_H */
+#elif defined(HAVE_SNMP_SNMP_H)
+#ifdef HAVE_SNMP_VERSION_H
+#include <snmp/version.h>
+#endif /* HAVE_SNMP_VERSION_H */
+#endif /* SNMP */
#ifdef NEED_STRERROR_H
#include "strerror.h"
@@ -961,12 +967,16 @@ main(int argc, char *argv[])
#if defined(HAVE_UCD_SNMP_SNMP_H)
#ifdef HAVE_UCD_SNMP_VERSION_H
"with UCD SNMP ", VersionInfo
-#else
+#else /* HAVE_UCD_SNMP_VERSION_H */
"with UCD SNMP ", "(version unknown)"
-#endif
+#endif /* HAVE_UCD_SNMP_VERSION_H */
#elif defined(HAVE_SNMP_SNMP_H)
+#ifdef HAVE_SNMP_VERSION_H
+ "with CMU SNMP ", snmp_Version()
+#else /* HAVE_SNMP_VERSION_H */
"with CMU SNMP ", "(version unknown)"
-#else
+#endif /* HAVE_SNMP_VERSION_H */
+#else /* no SNMP */
"without SNMP", ""
#endif
);