Allow admin clients to filter out async messages. Send notifications

[tripe] / configure.in

diff --git a/configure.in b/configure.in
index 03ad025c7cf8ff08d3815986d1e4548c1ec65b97..6163a8d87fed39f15e96709ade8f83f57dbf5ff5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl -*-autoconf-*-
 dnl
-dnl $Id: configure.in,v 1.16 2004/04/19 07:44:16 mdw Exp $
+dnl $Id$
 dnl
 dnl Configuration script for TrIPE
 dnl
@@ -33,6 +33,7 @@ AC_CANONICAL_HOST
 AC_PROG_MAKE_SET
 AC_PROG_CC
 AM_PROG_LIBTOOL
+AC_CHECK_HEADERS([stdarg.h])
 mdw_GCC_FLAGS([-Wall])
 mdw_OPT_TRACE
 
@@ -90,17 +91,20 @@ changequote(,)dnl
       2.[4-9].* | 2.[1-9][0-9]*.* | [3-9].* | [1-9][0-9]*.*)
 changequote([,])dnl
        tun=linux
-       AC_DEFINE([TUN_TYPE], [TUN_LINUX])
+       AC_DEFINE([TUN_TYPE], [TUN_LINUX], 
+        [Set to the tunnel driver for your OS.  See TUN_* in tripe.h.])
        ;;
       *)
        tun=unet
-       AC_DEFINE([TUN_TYPE], [TUN_UNET])
+       AC_DEFINE([TUN_TYPE], [TUN_UNET],
+        [Set to the tunnel driver for your OS.  See TUN_* in tripe.h.])
        ;;
     esac
     ;;
   *bsd*)
     tun=bsd
-    AC_DEFINE([TUN_TYPE], [TUN_BSD])
+    AC_DEFINE([TUN_TYPE], [TUN_BSD],
+    [Set to the tunnel driver for your OS.  See TUN_* in tripe.h.])
     ;;
   *)
     AC_MSG_ERROR([Unsupported OS: no tunnel interface available])
@@ -118,14 +122,14 @@ if test "$ethereal" = true -a "$ETHEREAL_PLUGIN_DIR" = unknown; then
     mdw_cv_ethereal_plugin_dir="failed"
     ethprefix=none
     for i in "${prefix}" /usr/local /usr `echo $PATH | tr : " "`; do
-      if test -x "$i/bin/ethereal"; then
+      if test -x "$i/bin/tethereal"; then
         ethprefix=$i
         break
       fi
     done
     if test "$ethprefix" != none; then
-      ethbin=$ethprefix/bin/ethereal
-      ethver=`$ethbin -v | sed 's/^[^ ]* \([0-9A-Za-z.]*\).*$/\1/'`
+      ethbin=$ethprefix/bin/tethereal
+      ethver=`$ethbin -v | sed 's/^[^ ]* \([0-9A-Za-z.]*\).*$/\1/;q'`
       dir=$ethprefix/lib/ethereal/plugins/$ethver
       if test -d "$dir"; then
         mdw_cv_ethereal_plugin_dir=$dir
@@ -162,10 +166,11 @@ if test "$ethereal" = true; then
       AC_TRY_COMPILE([
 #include <netinet/in.h>
 #include <glib.h>
-#include <epan/packet.h>
+#include <ethereal/config.h>
+#include <ethereal/epan/packet.h>
 ], [
        dissector_handle_t dh;
-       dh = creat_dissector_handle(0, 0);
+       dh = create_dissector_handle(0, 0);
       ], [bad=false; break])
     done
     if test $bad = false; then
@@ -180,26 +185,6 @@ if test "$ethereal" = true; then
 fi
 
 if test "$ethereal" = true; then
-  AC_CACHE_CHECK([whether the Ethereal headers are broken],
-    [mdw_cv_ethereal_buggered], [
-    CFLAGS="$GLIB_CFLAGS $i"
-    AC_TRY_COMPILE([
-#include <netinet/in.h>
-#include <glib.h>
-#include <epan/packet.h>
-#include <plugins/plugin_api.h>
-], [
-      G_MODULE_EXPORT void plugin_init(plugin_address_table_t *pat)
-      {
-        plugin_address_table_init(pat);
-      }
-    ], [mdw_cv_ethereal_buggered=no], [mdw_cv_ethereal_buggered=yes])
-    CFLAGS=$mdw_CFLAGS
-  ])
-  if test $mdw_cv_ethereal_buggered = yes; then
-    AC_DEFINE(ETHEREAL_BUGGERED)
-  fi
-
   ETHEREAL_CFLAGS="$CFLAGS $GLIB_CFLAGS $mdw_cv_ethereal_includes"
   AC_SUBST(ETHEREAL_CFLAGS)
   AC_SUBST(ETHEREAL_PLUGIN_DIR)
@@ -210,6 +195,10 @@ if test "$ethereal" = false -a "$requireethereal" = true; then
   AC_MSG_ERROR([failed to configure Ethereal plugin])
 fi
 
+AH_TEMPLATE([CONFIGDIR],
+            [Tripe should look here for keys and other configuration.])
+AH_TEMPLATE([SOCKETDIR],
+            [Tripe should make its administration socket here.])
 mdw_DEFINE_PATHS([
   mdw_DEFINE_PATH([CONFIGDIR], [$configdir])
   mdw_DEFINE_PATH([SOCKETDIR], [$socketdir])