configure.ac: Some random formatting tweaks.

[tripe] / configure.ac

diff --git a/configure.ac b/configure.ac
index 608298b0df79c6073c9fb77c42ae6e1c71c503f5..d1eb4d285c629daa555dec8c16d2d9af7427815b 100644 (file)
--- 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
@@ -31,6 +31,7 @@ AC_INIT([tripe], AUTO_VERSION, [mdw@distorted.org.uk])
 AC_CONFIG_SRCDIR([server/tripe.h])
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([foreign])
+mdw_SILENT_RULES
 
 AC_PROG_CC
 AM_PROG_CC_C_O
@@ -40,6 +41,11 @@ AM_PROG_LIBTOOL
 
 AC_CHECK_PROGS([AUTOM4TE], [autom4te])
 
+mdw_ORIG_CFLAGS=$CFLAGS
+mdw_ORIG_CPPFLAGS=$CPPFLAGS
+AC_SUBST(AM_CFLAGS)
+AC_SUBST(AM_CPPFLAGS)
+
 dnl--------------------------------------------------------------------------
 dnl C programming environment.
 
@@ -50,17 +56,17 @@ AC_SEARCH_LIBS([socket], [socket])
 case "$host_os" in
   linux)
     AC_ARG_WITH([linux-includes],
-               AS_HELP_STRING(
+               AS_HELP_STRING(
                  [--with-linux-includes=DIR],
                  [Linux kernel includes]),
-               [CFLAGS="$CFLAGS -I$withval"], [:])
+               [AM_CPPFLAGS="AM_CPPFLAGS -I$withval"], [:])
     ;;
 esac
 
 PKG_CHECK_MODULES([mLib], [mLib >= 2.1.0])
-PKG_CHECK_MODULES([catacomb], [catacomb >= 2.1.1])
+PKG_CHECK_MODULES([catacomb], [catacomb >= 2.1.4])
 
-CFLAGS="$CFLAGS $mLib_CFLAGS $catacomb_CFLAGS"
+AM_CFLAGS="$AM_CFLAGS $mLib_CFLAGS $catacomb_CFLAGS"
 
 dnl--------------------------------------------------------------------------
 dnl Directories to install things into.
@@ -89,8 +95,9 @@ TRIPE_DEFINE_PATH(
   [pidfile], [FILE], [process-id [[./tripectl.pid]]], [tripectl.pid])
 
 TRIPE_DEFINE_PATH(
-  [initconfig], [FILE], [configuration for init script [[/etc/tripe.conf]]],
-  [/etc/tripe.conf])
+  [initconfig], [FILE],
+  [configuration for init script [[SYSCONFDIR/tripe.conf]]],
+  ['${sysconfdir}/tripe.conf'])
 
 TRIPE_DEFINE_PATH(
   [logfile], [FILE], [logging output [[./tripe.log]]], [tripe.log])
@@ -115,19 +122,6 @@ AC_ARG_WITH([tracing],
              AC_DEFINE([NTRACE], [1], [Disable all tracing.])],
            [:])
 
-dnl--------------------------------------------------------------------------
-dnl Path MTU discovery.
-
-case $host_os in
-  linux*)
-    pmtu=yes
-    ;;
-  *)
-    pmtu=no
-    ;;
-esac
-AM_CONDITIONAL([PATHMTU], [test $pmtu = yes])
-
 dnl--------------------------------------------------------------------------
 dnl Tunnel devices.
 
@@ -217,28 +211,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 ;;
@@ -294,7 +292,7 @@ case "$haveshark,$needshark" in
     AC_MSG_ERROR([failed to configure Wireshark plugin])
     ;;
   yes,*)
-    WIRESHARK_CFLAGS="$CFLAGS $GLIB_CFLAGS $mdw_cv_wireshark_includes"
+    WIRESHARK_CFLAGS="$GLIB_CFLAGS $mdw_cv_wireshark_includes"
     AC_SUBST(WIRESHARK_CFLAGS)
     AC_SUBST(wireshark_plugindir)
     ;;
@@ -305,6 +303,9 @@ AM_CONDITIONAL([HAVE_WIRESHARK], [test "$haveshark" = yes])
 dnl--------------------------------------------------------------------------
 dnl Produce output.
 
+CFLAGS=$mdw_ORIG_CFLAGS
+CPPFLAGS=$mdw_ORIG_CPPFLAGS
+
 AC_CONFIG_HEADER([config/config.h])
 AC_CONFIG_TESTDIR([t])
 
@@ -321,10 +322,12 @@ AC_CONFIG_FILES(
   [wireshark/Makefile]
   [init/Makefile]
   [py/Makefile]
+  [peerdb/Makefile]
   [keys/Makefile]
   [svc/Makefile]
   [mon/Makefile]
+  [contrib/Makefile]
   [t/Makefile t/atlocal])
 AC_OUTPUT
 
-dnl ----- That's all, folks -------------------------------------------------
+dnl----- That's all, folks --------------------------------------------------