From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 10 Jul 2017 08:53:51 +0000 (+0100)
Subject: configure.ac: Check probed Wireshark plugin directory exists.
X-Git-Tag: 1.5.0~152
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/commitdiff_plain/7b00539c4c7fcded1c26e675a2aaa7c7bd659161

configure.ac: Check probed Wireshark plugin directory exists.

If we've found a plugin directory by probing, then check that the thing
actually exists.  It turns out that the `pkg-config' dropping is not as
accurate as one might naïvely hope.
---

diff --git a/configure.ac b/configure.ac
index ce74aebb..4e83e754 100644
--- a/configure.ac
+++ b/configure.ac
@@ -227,7 +227,15 @@ case "$haveshark,$wireshark_plugindir" in
       mdw_cv_wireshark_plugin_dir=$(
 	$PKG_CONFIG --variable=plugindir "wireshark >= 1.12.1")])
     case "$mdw_cv_wireshark_plugin_dir" in
-      /*) wireshark_plugindir=$mdw_cv_wireshark_plugin_dir ;;
+      /*)
+	if test ! -d "$mdw_cv_wireshark_plugin_dir"; then
+	  AC_MSG_WARN([alleged Wireshark plugin directory $mdw_cv_wireshark_plugin_dir doesn't exist])
+	  haveshark=no
+	else
+	  wireshark_plugindir=$mdw_cv_wireshark_plugin_dir
+	  haveshark=yes
+	fi
+	;;
       *)
 	AC_MSG_WARN([failed to read Wireshark plugin directory])
 	haveshark=no