diff options
| -rw-r--r-- | Makefile.am | 26 | ||||
| -rw-r--r-- | capinfos.c | 10 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | editcap.c | 11 |
4 files changed, 15 insertions, 34 deletions
diff --git a/Makefile.am b/Makefile.am index a2aae2902a..e3bab7f408 100644 --- a/Makefile.am +++ b/Makefile.am @@ -384,34 +384,12 @@ mergecap_LDADD = \ # Libraries with which to link capinfos. capinfos_LDADD = \ wiretap/libwiretap.la \ - epan/libwireshark.la \ - @INET_PTON_LO@ \ - @SSL_LIBS@ \ - $(plugin_ldadd) \ - @PCRE_LIBS@ \ - @GLIB_LIBS@ -lm \ - @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ \ - @FRAMEWORKS@ \ - @LIBICONV@ \ - @LIBGCRYPT_LIBS@ \ - @LIBGNUTLS_LIBS@ \ - @LIBSMI_LDFLAGS@ + @GLIB_LIBS@ # Libraries with which to link editcap. editcap_LDADD = \ wiretap/libwiretap.la \ - epan/libwireshark.la \ - @INET_PTON_LO@ \ - @SSL_LIBS@ \ - $(plugin_ldadd) \ - @PCRE_LIBS@ \ - @GLIB_LIBS@ -lm \ - @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ \ - @FRAMEWORKS@ \ - @LIBICONV@ \ - @LIBGCRYPT_LIBS@ \ - @LIBGNUTLS_LIBS@ \ - @LIBSMI_LDFLAGS@ + @GLIB_LIBS@ # Libraries with which to link randpkt. randpkt_LDADD = \ diff --git a/capinfos.c b/capinfos.c index e94a3bb18c..d9be5194d1 100644 --- a/capinfos.c +++ b/capinfos.c @@ -262,14 +262,14 @@ usage(gboolean is_error) } /* - * Errors are reported with a console message. + * Don't report failures to load plugins because most (non-wiretap) plugins + * *should* fail to load (because we're not linked against libwireshark and + * dissector plugins need libwireshark). */ static void -failure_message(const char *msg_format, va_list ap) +failure_message(const char *msg_format _U_, va_list ap _U_) { - fprintf(stderr, "capinfos: "); - vfprintf(stderr, msg_format, ap); - fprintf(stderr, "\n"); + return; } diff --git a/configure.in b/configure.in index 3b5c19ac0d..4fa55e36e4 100644 --- a/configure.in +++ b/configure.in @@ -1567,7 +1567,7 @@ CPPFLAGS="$CPPFLAGS '-DPLUGIN_DIR=\"\$(plugindir)\"'" # # The plugin dissectors reside in ./plugins/PROTO/ # -PLUGIN_LIBS="-L../../epan -lwireshark" +PLUGIN_LIBS="" AC_SUBST(PLUGIN_LIBS) dnl libtool defs @@ -370,12 +370,15 @@ list_encap_types(void) { } } +/* + * Don't report failures to load plugins because most (non-wiretap) plugins + * *should* fail to load (because we're not linked against libwireshark and + * dissector plugins need libwireshark). + */ static void -failure_message(const char *msg_format, va_list ap) +failure_message(const char *msg_format _U_, va_list ap _U_) { - fprintf(stderr, "editcap: "); - vfprintf(stderr, msg_format, ap); - fprintf(stderr, "\n"); + return; } int |