From Kovarththanan Rajaratnam's patch in bug 3500:

Added info about python version.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28543 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.am b/Makefile.am
index fadf580e4afeaab99ee0e78718cb489c29047a3d..213f5015efa7d00045b8c4aabbbf35786d7f4191 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -475,7 +475,7 @@ dumpcap_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
 
 # Common headers
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap \
-       $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS)
+       $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS) $(PY_CFLAGS)
 
 #
 # Build the version string

diff --git a/version_info.c b/version_info.c
index 440bb6cb9f2826fb6673b9cc5b418a4783b00e0a..2cf7d3df099b485deee617a3f361c042a8a01000 100644 (file)
--- a/version_info.c
+++ b/version_info.c
@@ -33,6 +33,10 @@
 #include <string.h>
 #include <errno.h>
 
+#ifdef HAVE_PYTHON
+#include <Python.h> /* to get the Python version number (PY_VERSION) */
+#endif
+
 #ifdef HAVE_LIBZ
 #include <zlib.h>      /* to get the libz version number */
 #endif
@@ -248,6 +252,16 @@ get_epan_compiled_version_info(GString *str)
        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