chiark / gitweb /
configure.ac: Hack probed Wireshark plugin dir in case of corruption.
authorMark Wooding <mdw@distorted.org.uk>
Mon, 10 Jul 2017 09:32:23 +0000 (10:32 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Mon, 10 Jul 2017 09:32:23 +0000 (10:32 +0100)
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.

configure.ac

index 4e83e75..f3b75ea 100644 (file)
@@ -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=$(
     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
     case "$mdw_cv_wireshark_plugin_dir" in
       /*)
        if test ! -d "$mdw_cv_wireshark_plugin_dir"; then