diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-09-12 20:23:57 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-09-12 20:23:57 +0000 |
| commit | a86b6f19cf8abdeae7592193fdbe40079c3ff472 (patch) | |
| tree | a9f85e07658d558e402fdc62ede3430b0bbcab67 /gtk/main.c | |
| parent | 4e7d0ad79874d0b3d176983cfc3fd8a6b53ac259 (diff) | |
Move the PortAudio stuff to from version_info.c to gtk/main.c, so it can
use Pa_GetVersionText().
(The word-wrapping stuff appears to work.)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19222 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk/main.c')
| -rw-r--r-- | gtk/main.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/gtk/main.c b/gtk/main.c index 81de778d00..c98a25419b 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -52,6 +52,10 @@ #include <conio.h> #endif +#ifdef HAVE_LIBPORTAUDIO +#include <portaudio.h> +#endif /* HAVE_LIBPORTAUDIO */ + #include <epan/epan.h> #include <epan/filesystem.h> #include <epan/privileges.h> @@ -2058,6 +2062,18 @@ main(int argc, char *argv[]) /* Assemble the compile-time version information string */ comp_info_str = g_string_new("Compiled "); +#ifdef HAVE_LIBPORTAUDIO +#ifdef PORTAUDIO_API_1 + g_string_append(comp_info_str, "with PortAudio <= V18"); +#else + g_string_append(comp_info_str, "with PortAudio "); + g_string_append(comp_info_str, Pa_GetVersionText()); +#endif +#else + g_string_append(comp_info_str, "without PortAudio"); +#endif /* HAVE_LIBPORTAUDIO */ + g_string_append(comp_info_str, ", "); + g_string_append(comp_info_str, "with "); g_string_sprintfa(comp_info_str, #ifdef GTK_MAJOR_VERSION @@ -2066,8 +2082,8 @@ main(int argc, char *argv[]) #else "GTK+ (version unknown)"); #endif - g_string_append(comp_info_str, ", "); + get_compiled_version_info(comp_info_str); /* Assemble the run-time version information string */ |