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.

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

diff --git a/Makefile.nmake b/Makefile.nmake
index 74e7b6c28d90aa0b9555b3720fd58463e07e5bbf..68dac56f4de16b1ceb2f581c8a5338fa6bbfed2b 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -227,8 +227,8 @@ config.h    : config.h.win32 config.nmake
            -e "s/@HAVE_LUA@/$(LUA_CONFIG)/" \
            -e "s/@HAVE_LUA_5_1@/$(LUA_VERSION)/" \
            -e "s/@HAVE_AIRPCAP@/$(AIRPCAP_CONFIG)/" \
-           -e "s/@HAVE_PORTAUDIO@/$(PORTAUDIO_CONFIG)/" \
-           -e "s/@HAVE_PORTAUDIO_API@/$(PORTAUDIO_API_CONFIG)/" \
+           -e "s/@HAVE_LIBPORTAUDIO@/$(PORTAUDIO_CONFIG)/" \
+           -e "s/@PORTAUDIO_API_1@/$(PORTAUDIO_API_CONFIG)/" \
            -e "s/@HAVE_NET_SNMP@/$(NET_SNMP_CONFIG)/" \
            -e "s/@HAVE_SOME_SNMP@/$(SOME_SNMP_CONFIG)/" \
            < config.h.win32 > $@

diff --git a/config.h.win32 b/config.h.win32
index 15e42873b3c56a1424a71b4186720daa8dc55373..be279f80cacd78dc8f3c1b7c40131e4f1e56609a 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -221,9 +221,9 @@
 @HAVE_LUA_5_1@
 
 /* Define to use Portaudio library */
-@HAVE_PORTAUDIO@
+@HAVE_LIBPORTAUDIO@
 /* Define  version of of the Portaudio library API */
-@HAVE_PORTAUDIO_API@
+@PORTAUDIO_API_1@
 
 #ifndef WIN32
 #define WIN32                  1

diff --git a/version_info.c b/version_info.c
index a92e46998381dd484bc88788b62eada466a876e9..3411e86dcb412a6ffcd4cd27e389d51b45e51f0e 100644 (file)
--- 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, ".");