X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/f129dc5f9a08673a9839eb7b6b1faa647fecdcb4..36b9f99a5250c776888c50ad7ddd89afce84c31d:/configure.ac

diff --git a/configure.ac b/configure.ac
index ad39a1f4..dc5ed909 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl
 dnl (c) 2001 Straylight/Edgeware
 dnl
 
-dnl ----- Licensing notice --------------------------------------------------
+dnl----- Licensing notice ---------------------------------------------------
 dnl
 dnl This file is part of Trivial IP Encryption (TrIPE).
 dnl
@@ -36,6 +36,7 @@ mdw_SILENT_RULES
 AC_PROG_CC
 AM_PROG_CC_C_O
 AX_CFLAGS_WARN_ALL
+AX_TYPE_SOCKLEN_T
 AC_CANONICAL_HOST
 AM_PROG_LIBTOOL
 
@@ -63,8 +64,8 @@ case "$host_os" in
     ;;
 esac
 
-PKG_CHECK_MODULES([mLib], [mLib >= 2.1.0])
-PKG_CHECK_MODULES([catacomb], [catacomb >= 2.1.1])
+PKG_CHECK_MODULES([mLib], [mLib >= 2.2.1])
+PKG_CHECK_MODULES([catacomb], [catacomb >= 2.2.2-38])
 
 AM_CFLAGS="$AM_CFLAGS $mLib_CFLAGS $catacomb_CFLAGS"
 
@@ -180,12 +181,16 @@ dnl Find out whether Python exists at all.
 AM_PATH_PYTHON([2.4], [python=yes], [python=no])
 AM_CONDITIONAL([HAVE_PYTHON], [test $python = yes])
 
-dnl Find out whether we can use Catacomb and GTK.
+dnl Find out whether we can use the various external modules.
 if test $python = yes; then
   AC_PYTHON_MODULE([pygtk])
+  AC_PYTHON_MODULE([cdb])
+  AC_PYTHON_MODULE([mLib])
   AC_PYTHON_MODULE([catacomb])
 fi
 AM_CONDITIONAL([HAVE_PYGTK], [test ${HAVE_PYMOD_PYGTK-no} = yes])
+AM_CONDITIONAL([HAVE_PYCDB], [test ${HAVE_PYMOD_CDB-no} = yes])
+AM_CONDITIONAL([HAVE_PYMLIB], [test ${HAVE_PYMOD_MLIB-no} = yes])
 AM_CONDITIONAL([HAVE_PYCATACOMB], [test ${HAVE_PYMOD_CATACOMB-no} = yes])
 
 dnl--------------------------------------------------------------------------
@@ -211,28 +216,32 @@ AC_ARG_WITH([wireshark],
 	    esac],
 	    [haveshark=yes needshark=no])
 
-dnl Try to find the Wireshark installation directory the hard way.
+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
   yes,unknown)
     AC_CACHE_CHECK([where to put Wireshark plugins],
       [mdw_cv_wireshark_plugin_dir], [
-      mdw_cv_wireshark_plugin_dir="failed"
-      wsprefix=none
-      for i in "${prefix}" /usr/local /usr `echo $PATH | tr : " "`; do
-	if test -x "$i/bin/tshark"; then
-	   wsprefix=$i
-	   break
-	fi
-      done
-      if test "$wsprefix" != none; then
-	wsbin=$wsprefix/bin/tshark
-	wsver=`$wsbin -v | sed ['s/^[^ ]* \([0-9A-Za-z.]*\).*$/\1/;q']`
-	dir=$wsprefix/lib/wireshark/plugins
-	test -d "$dir/$wsver" && dir="$dir/$wsver"
-	if test -d "$dir"; then
-	  mdw_cv_wireshark_plugin_dir=$dir
-	fi
-      fi
+      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 ;;
@@ -326,4 +335,4 @@ AC_CONFIG_FILES(
   [t/Makefile t/atlocal])
 AC_OUTPUT
 
-dnl ----- That's all, folks -------------------------------------------------
+dnl----- That's all, folks --------------------------------------------------