From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 10 Jul 2017 09:32:23 +0000 (+0100)
Subject: configure.ac: Hack probed Wireshark plugin dir in case of corruption.
X-Git-Tag: 1.5.0~151
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/commitdiff_plain/77781be832eea78e2942b3a9422e0f3b438045ac?hp=7b00539c4c7fcded1c26e675a2aaa7c7bd659161

configure.ac: Hack probed Wireshark plugin dir in case of corruption.

Somehow the Debian package (at least) of Wireshark ships with a
`pkg-config' dropping which contains a broken `libdir' -- and, hence,
`plugindir'.  This has happened before, and it's therefore not unlikely
to happen again.  Defend ourselves against this mess by spotting the
bungled value (which is distinctively and obviously wrong) and fixing
it.
---

diff --git a/configure.ac b/configure.ac
index 4e83e754..f3b75ea2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -225,7 +225,14 @@ case "$haveshark,$wireshark_plugindir" in
     AC_CACHE_CHECK([where to put Wireshark plugins],
       [mdw_cv_wireshark_plugin_dir], [
       mdw_cv_wireshark_plugin_dir=$(
-	$PKG_CONFIG --variable=plugindir "wireshark >= 1.12.1")])
+	$PKG_CONFIG --variable=plugindir "wireshark >= 1.12.1")
+      dnl It seems that the Debian package has a habit of bungling the
+      dnl plugin path (#779788, #857729, ...).
+      case "$mdw_cv_wireshark_plugin_dir" in
+	/usr//usr/*)
+	  mdw_cv_wireshark_plugin_dir=${mdw_cv_wireshark_plugin_dir#/usr/}
+	  ;;
+      esac])
     case "$mdw_cv_wireshark_plugin_dir" in
       /*)
 	if test ! -d "$mdw_cv_wireshark_plugin_dir"; then