doc/.gitignore: Make the patterns more general.

[tripe] / configure.ac

diff --git a/configure.ac b/configure.ac
index 6f11c6639c43672bd621ce1717ef3374f120dccc..33ce67dd442ec50be78cfaffdb29dc4568f2b6e2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -65,7 +65,7 @@ case "$host_os" in
 esac
 
 PKG_CHECK_MODULES([mLib], [mLib >= 2.2.1])
-PKG_CHECK_MODULES([catacomb], [catacomb >= 2.1.4])
+PKG_CHECK_MODULES([catacomb], [catacomb >= 2.2.2-38])
 
 AM_CFLAGS="$AM_CFLAGS $mLib_CFLAGS $catacomb_CFLAGS"
 
@@ -195,101 +195,53 @@ AM_CONDITIONAL([HAVE_PYCATACOMB], [test ${HAVE_PYMOD_CATACOMB-no} = yes])
 
 dnl--------------------------------------------------------------------------
 dnl Wireshark.
-dnl
-dnl This is all distressingly ugly and complicated.  Why they can't just
-dnl provide a pkg-config dropping containing all the useful information about
-dnl the installation I don't know.
-
-WIRESHARK_CFLAGS=""
-: ${wireshark_plugindir=unknown}
 
 dnl Get the user to help.
+wireshark_plugindir=unknown
 AC_ARG_WITH([wireshark],
            AS_HELP_STRING(
-             [--with-wireshark[=DIR]],
+             [--with-wireshark],
              [build and install Wireshark plugin]),
            [case "$withval" in
-              no)  haveshark=no needshark=no ;;
-              yes) haveshark=yes needshark=yes ;;
-              *)   haveshark=yes needshark=yes
+              no)  wantshark=no mustshark=no ;;
+              yes) wantshark=yes mustshark=yes ;;
+              *)   wantshark=yes mustshark=yes
                    wireshark_plugindir=$withval ;;
            esac],
-           [haveshark=yes needshark=no])
+           [wantshark=yes mustshark=no])
 
-dnl Try to find the Wireshark installation directory the hard way.  This is
-dnl remarkably annoying.  This is, unfortunately, very likely to guess wrong,
-dnl but there doesn't seem to be a better way.
-case "$haveshark,$wireshark_plugindir" in
+case "$wantshark,$wireshark_plugindir" in
   yes,unknown)
     AC_CACHE_CHECK([where to put Wireshark plugins],
       [mdw_cv_wireshark_plugin_dir], [
       mdw_cv_wireshark_plugin_dir=$(
-       for i in \
-         $libexecdir $libdir $exec_prefix/lib $prefix/lib \
-         /usr/local/lib /usr/lib
-       do
-         for j in \
-           wireshark/plugins/* wireshark/*/plugins \
-           */wireshark/plugins/* */wireshark/*/plugins
-         do
-           for k in $i/$j/*.so; do
-             if test -f "$k"; then
-               echo $(AS_DIRNAME(["$k"]))
-               exit
-             fi
-           done
-         done
-       done
-       echo "failed"
-      )
-    ])
-    case $mdw_cv_wireshark_plugin_dir in
-      failed) haveshark=no ;;
-      *) wireshark_plugindir=$mdw_cv_wireshark_plugin_dir ;;
-    esac
-esac
-
-dnl If we're still interested, find Glib.
-case "$haveshark" in
-  yes) AM_PATH_GLIB_2_0([2.4.0], [], [haveshark=false], [gmodule]) ;;
-esac
-
-dnl Find the include directory.  This would be much easier if they just
-dnl provided a pkg-config file.
-case "$haveshark" in
-  yes)
-    bad=yes
-    mdw_CFLAGS=$CFLAGS
-    wsprefix=`echo $wireshark_plugindir | sed 's:/lib/.*$::'`
-    AC_CACHE_CHECK([how to find the Wireshark headers],
-                  [mdw_cv_wireshark_includes], [
-      mdw_cv_wireshark_includes=failed
-      for i in \
-         "" \
-         "-I${wsprefix}/include/wireshark" \
-         "-I${wsprefix}/include" \
-         "-I${prefix}/include/wireshark" \
-         "-I${prefix}/include" \
-         "-I/usr/include/wireshark" \
-         "-I/usr/local/include/wireshark" \
-         "-I/usr/local/include"; do
-       CFLAGS="$GLIB_CFLAGS $i"
-       AC_TRY_COMPILE([
-#include <netinet/in.h>
-#include <glib.h>
-#include <wireshark/config.h>
-#include <wireshark/epan/packet.h>],
-       [dissector_handle_t dh; dh = create_dissector_handle(0, 0);],
-       [bad=no; break])
-      done
-      case "$bad" in
-       no) mdw_cv_wireshark_includes=$i ;;
-      esac
-      CFLAGS=$mdw_CFLAGS
-    ])
-    case "$mdw_cv_wireshark_includes" in
-      failed) haveshark=no ;;
+       $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
+         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
+       ;;
     esac
+    ;;
+  no,*)
+    haveshark=no
+    ;;
 esac
 
 case "$haveshark,$needshark" in
@@ -297,8 +249,6 @@ case "$haveshark,$needshark" in
     AC_MSG_ERROR([failed to configure Wireshark plugin])
     ;;
   yes,*)
-    WIRESHARK_CFLAGS="$GLIB_CFLAGS $mdw_cv_wireshark_includes"
-    AC_SUBST(WIRESHARK_CFLAGS)
     AC_SUBST(wireshark_plugindir)
     ;;
 esac