From 3db13a7fc9f08fdb238f06e73a42b39396fee84c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= <joao.valverde@tecnico.ulisboa.pt>
Date: Tue, 19 Apr 2016 08:03:08 +0100
Subject: Link version code statically again
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This allows keeping the code-sharing with the static linking.

This "fixes" a hypothetical ABI mismatch with wsutil and avoids pulling more
external dependencies to wsutil than strictly necessary.

A nice side-effect is that libwsutil no longer depends on version.h.

Follow up to f95976eefcbeb5d24df383c29d29ef888b503945.

Change-Id: I8f0d6a557ab3f7ce6f0e2c269124c89f29d6ad23
Reviewed-on: https://code.wireshark.org/review/15002
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
---
 wireshark-qt.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'wireshark-qt.cpp')

diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp
index 9b45ec6371..5f038aeaa1 100644
--- a/wireshark-qt.cpp
+++ b/wireshark-qt.cpp
@@ -45,7 +45,7 @@
 #endif
 #include <wsutil/report_err.h>
 #include <wsutil/unicode-utils.h>
-#include <wsutil/ws_version_info.h>
+#include <ws_version_info.h>
 
 #include <epan/addr_resolv.h>
 #include <epan/ex-opt.h>
-- 
cgit v1.2.1