diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2006-09-12 18:43:56 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2006-09-12 18:43:56 +0000 |
| commit | 5f9300b9e23befe1065a9f5643df81be08a89973 (patch) | |
| tree | 37c918854e1cfaa470471191c581367d4bb1507e /version_info.c | |
| parent | d0f09612b88f33b13c3fcb977a01ceb30f2dc715 (diff) | |
Makefile.nmake
config.h.win32
- Use HAVE_LIBPORTAUDIO instead of HAVE_PORTAUDIO to make
sure we use the same var everywhere (including sources
and autofoo stuff).
- Use PORTAUDIO_API_1 everywhere
version_info.c
- Include <portaudio.h>
- Add some , and breaks when printing version infos.
svn path=/trunk/; revision=19218
Diffstat (limited to 'version_info.c')
| -rw-r--r-- | version_info.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/version_info.c b/version_info.c index a92e469983..3411e86dcb 100644 --- a/version_info.c +++ b/version_info.c @@ -68,6 +68,10 @@ #include <sys/utsname.h> #endif +#ifdef HAVE_LIBPORTAUDIO +#include <portaudio.h> +#endif /* HAVE_LIBPORTAUDIO */ + #include "version_info.h" #include "capture-pcap-util.h" #include "epan/strutil.h" @@ -215,6 +219,7 @@ get_compiled_version_info(GString *str) g_string_append(str, "without ADNS"); #endif /* HAVE_GNU_ADNS */ g_string_append(str, ","); + do_word_wrap(str, break_point); /* LUA */ g_string_append(str, " "); @@ -225,6 +230,8 @@ get_compiled_version_info(GString *str) #else g_string_append(str, "without Lua"); #endif /* HAVE_LUA */ + g_string_append(str, ","); + do_word_wrap(str, break_point); /* GnuTLS */ g_string_append(str, " "); @@ -234,6 +241,8 @@ get_compiled_version_info(GString *str) #else g_string_append(str, "without GnuTLS"); #endif /* HAVE_LIBGNUTLS */ + g_string_append(str, ","); + do_word_wrap(str, break_point); /* Gcrypt */ g_string_append(str, " "); @@ -243,6 +252,8 @@ get_compiled_version_info(GString *str) #else g_string_append(str, "without Gcrypt"); #endif /* HAVE_LIBGCRYPT */ + g_string_append(str, ","); + do_word_wrap(str, break_point); /* Kerberos */ /* XXX - I don't see how to get the version number, at least for KfW */ @@ -258,21 +269,22 @@ get_compiled_version_info(GString *str) #else g_string_append(str, "without Kerberos"); #endif /* HAVE_KERBEROS */ + g_string_append(str, ","); + do_word_wrap(str, break_point); /* PortAudio */ g_string_append(str, " "); break_point = str->len - 1; -#ifdef HAVE_PORTAUDIO +#ifdef HAVE_LIBPORTAUDIO #ifdef PORTAUDIO_API_1 g_string_append(str, "with PortAudio <= V18"); #else g_string_append(str, "with PortAudio "); - /* XXX - is this correct? Will need an #include - but I can't test it */ g_string_append(str, Pa_GetVersionText()); #endif #else g_string_append(str, "without PortAudio"); -#endif /* HAVE_PORTAUDIO */ +#endif /* HAVE_LIBPORTAUDIO */ g_string_append(str, "."); |