Move the code to get version information for libraries used by

libwireshark into libwireshark, and call it only in programs linked with
libwireshark.  That way, programs that don't link with libwireshark
don't have to link with libgcrypt or libgnutls solely so that they can
say that they're linked with a particular version of libgcrypt or
libgnutls.

Don't link dumpcap with libgcrypt or libgnutls any more.

svn path=/trunk/; revision=33531

1 files changed, 0 insertions, 129 deletions

diff --git a/version_info.c b/version_info.c
index 2fb40d0ac0..ce5ce3fda3 100644
--- a/version_info.c
+++ b/version_info.c
@@ -67,18 +67,6 @@
 #include <windows.h>
 #endif
 
-#ifdef HAVE_C_ARES
-#include <ares_version.h>
-#endif
-
-#ifdef HAVE_LUA_5_1
-#include <lua.h>
-#endif
-
-#ifdef HAVE_LIBSMI
-#include <smi.h>
-#endif
-
 #ifdef HAVE_OS_X_FRAMEWORKS
 #include <CoreServices/CoreServices.h>
 #endif
@@ -197,113 +185,6 @@ get_compiled_version_info(GString *str, void (*additional_info)(GString *))
 }
 
 /*
- * Get compile-time information used only by applications that use
- * libwireshark.
- */
-void
-get_epan_compiled_version_info(GString *str)
-{
-        /* PCRE */
-	g_string_append(str, ", ");
-#ifdef HAVE_LIBPCRE
-	g_string_append(str, "with libpcre ");
-#ifdef PCRE_MAJOR
-#ifdef PCRE_MINOR
-	g_string_append_printf(str, "%u.%u", PCRE_MAJOR, PCRE_MINOR);
-#else			/* PCRE_MINOR */
-	g_string_append_printf(str, "%u", PCRE_MAJOR);
-#endif			/* PCRE_MINOR */
-#else		/* PCRE_MAJOR */
-	g_string_append(str, "(version unknown)");
-#endif		/* PCRE_MAJOR */
-#else	/* HAVE_LIBPCRE */
-	g_string_append(str, "without libpcre");
-#endif	/* HAVE_LIBPCRE */
-
-        /* SNMP */
-	g_string_append(str, ", ");
-#ifdef HAVE_LIBSMI
-	g_string_append(str, "with SMI " SMI_VERSION_STRING);
-#else /* no SNMP library */
-	g_string_append(str, "without SMI");
-#endif /* _SMI_H */
-
-	/* c-ares */
-	g_string_append(str, ", ");
-#ifdef HAVE_C_ARES
-	g_string_append(str, "with c-ares " ARES_VERSION_STR);
-#else
-	g_string_append(str, "without c-ares");
-
-	/* ADNS - only add if no c-ares */
-	g_string_append(str, ", ");
-#ifdef HAVE_GNU_ADNS
-	g_string_append(str, "with ADNS");
-#else
-	g_string_append(str, "without ADNS");
-#endif /* HAVE_GNU_ADNS */
-#endif /* HAVE_C_ARES */
-
-        /* LUA */
-	g_string_append(str, ", ");
-#ifdef HAVE_LUA_5_1
-	g_string_append(str, "with ");
-	g_string_append(str, LUA_VERSION);
-#else
-	g_string_append(str, "without Lua");
-#endif /* HAVE_LUA_5_1 */
-
-	g_string_append(str, ", ");
-#ifdef HAVE_PYTHON
-	g_string_append(str, "with Python");
-#ifdef PY_VERSION
-	g_string_append(str, " " PY_VERSION);
-#endif /* PY_VERSION */
-#else
-	g_string_append(str, "without Python");
-#endif /* HAVE_PYTHON */
-
-        /* GnuTLS */
-	g_string_append(str, ", ");
-#ifdef HAVE_LIBGNUTLS
-	g_string_append(str, "with GnuTLS " LIBGNUTLS_VERSION);
-#else
-	g_string_append(str, "without GnuTLS");
-#endif /* HAVE_LIBGNUTLS */
-
-        /* Gcrypt */
-	g_string_append(str, ", ");
-#ifdef HAVE_LIBGCRYPT
-	g_string_append(str, "with Gcrypt " GCRYPT_VERSION);
-#else
-	g_string_append(str, "without Gcrypt");
-#endif /* HAVE_LIBGCRYPT */
-
-        /* Kerberos */
-        /* XXX - I don't see how to get the version number, at least for KfW */
-	g_string_append(str, ", ");
-#ifdef HAVE_KERBEROS
-#ifdef HAVE_MIT_KERBEROS
-	g_string_append(str, "with MIT Kerberos");
-#else
-        /* HAVE_HEIMDAL_KERBEROS */
-	g_string_append(str, "with Heimdal Kerberos");
-#endif
-#else
-	g_string_append(str, "without Kerberos");
-#endif /* HAVE_KERBEROS */
-
-	/* GeoIP */
-	g_string_append(str, ", ");
-#ifdef HAVE_GEOIP
-	g_string_append(str, "with GeoIP");
-#else
-	g_string_append(str, "without GeoIP");
-#endif /* HAVE_GEOIP */
-
-}
-
-/*
  * Get various library run-time versions, and the OS version, and append
  * them to the specified GString.
  */
@@ -541,16 +422,6 @@ get_runtime_version_info(GString *str, void (*additional_info)(GString *))
         g_string_append_printf(str, ", with libz %s", zlibVersion());
 #endif
 
-    /* GnuTLS */
-#ifdef HAVE_LIBGNUTLS
-	g_string_append_printf(str, ", GnuTLS %s", gnutls_check_version(NULL));
-#endif /* HAVE_LIBGNUTLS */
-
-        /* Gcrypt */
-#ifdef HAVE_LIBGCRYPT
-	g_string_append_printf(str, ", Gcrypt %s", gcry_check_version(NULL));
-#endif /* HAVE_LIBGCRYPT */
-
 	/* Additional application-dependent information */
 	if (additional_info)
 		(*additional_info)(str);