X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/179d81291e52ac1a163f404adaaa6b156aace11e..e04c2d50fd96f3f31bc96851c55c6efecc10469c:/configure.in

diff --git a/configure.in b/configure.in
index 5c6693d8..b8dbbdef 100644
--- a/configure.in
+++ b/configure.in
@@ -15,12 +15,12 @@ dnl TrIPE is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
 dnl the Free Software Foundation; either version 2 of the License, or
 dnl (at your option) any later version.
-dnl 
+dnl
 dnl TrIPE is distributed in the hope that it will be useful,
 dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
 dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl GNU General Public License for more details.
-dnl 
+dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with TrIPE; if not, write to the Free Software Foundation,
 dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -36,7 +36,7 @@ AM_PROG_LIBTOOL
 DIRS="" AC_SUBST([DIRS])
 
 python=no
-mdw_PROG_PYTHON([2.3], 
+mdw_PROG_PYTHON([2.3],
   [python=yes
    pyscripts='${PYTHONSCRIPTS}'
    DIRS="$DIRS keys"
@@ -50,7 +50,7 @@ if test $python = yes; then
     python -c >&5 2>&5 '
 import pygtk
 pygtk.require("2.0")
-import gtk 
+import gtk
 ' && mdw_cv_pygtk=yes
   ])
   if test $mdw_cv_pygtk = yes; then
@@ -67,43 +67,43 @@ mdw_OPT_TRACE
 
 AC_ARG_WITH([linux-includes],
 [  --with-linux-includes=DIR
-                          search for Linux kernel includes in DIR],
+			  search for Linux kernel includes in DIR],
 [CFLAGS="$CFLAGS -I$withval"],
 [:])
 
 AC_ARG_WITH([configdir],
-[  --with-configdir=DIR    look for keys and other configuration in DIR
-                          [default=/var/lib/tripe]],
+[  --with-configdir=DIR	   look for keys and other configuration in DIR
+			  [default=/var/lib/tripe]],
 [configdir=$withval],
 [configdir=/var/lib/tripe])
 
 AC_ARG_WITH([socketdir],
-[  --with-socketdir=DIR    put admin socket in DIR [default=.]],
+[  --with-socketdir=DIR	   put admin socket in DIR [default=.]],
 [socketdir=$withval],
 [socketdir=.])
 
 AC_ARG_WITH([pidfile],
-[  --with-pidfile=FILE     make tripectl write its pid to FILE
-                          [default=./tripectl.pid]],
+[  --with-pidfile=FILE	   make tripectl write its pid to FILE
+			  [default=./tripectl.pid]],
 [pidfile=$withval],
 [pidfile=tripectl.pid])
 
 AC_ARG_WITH([initconfig],
 [  --with-initconfig=FILE  read definitions from FILE in init script
-                          [default=/etc/tripe.conf]],
+			  [default=/etc/tripe.conf]],
 [initconfig=$withval],
 [initconfig=/etc/tripe.conf])
 
 AC_ARG_WITH([logfile],
-[  --with-logfile=DIR      make tripectl write its log to FILE 
-                          [default=./tripe.log]],
+[  --with-logfile=DIR	   make tripectl write its log to FILE
+			  [default=./tripe.log]],
 [logfile=$withval],
 [logfile=tripe.log])
 
 WIRESHARK_CFLAGS=""
 WIRESHARK_PLUGIN_DIR="unknown"
 AC_ARG_WITH([wireshark],
-[  --with-wireshark        build and install Wireshark plugin],
+[  --with-wireshark	   build and install Wireshark plugin],
 [case "$withval" in
    no) wireshark=false requirewireshark=false;;
    yes) wireshark=true; requirewireshark=true;;
@@ -113,8 +113,8 @@ esac],
 
 tun=auto
 AC_ARG_WITH([tunnel],
-[  --with-tunnel=KIND      kinds of tunnel device to use
-                            (linux, unet, bsd, slip)],
+[  --with-tunnel=KIND	   kinds of tunnel device to use
+			    (linux, unet, bsd, slip)],
 [tun=$withval])
 
 if test "$tun" = auto; then
@@ -150,21 +150,21 @@ for i in $tun; do
     bsd) AC_DEFINE([TUN_BSD], [1],
 		   [Install the BSD tunnel driver.]) ;;
     unet) AC_DEFINE([TUN_UNET], [1],
-                    [Install the obsolete Linux Usernet driver.]) ;;
+		    [Install the obsolete Linux Usernet driver.]) ;;
     slip) ;;
     *) AC_MSG_ERROR([Unknown tunnel type]) ;;
   esac
   tunnels="$tunnels&tun_$i, "
 done
 AC_SUBST(tun)
-AC_DEFINE_UNQUOTED([TUN_LIST], [$tunnels 0], 
+AC_DEFINE_UNQUOTED([TUN_LIST], [$tunnels 0],
   [List of tunnel drivers to install.])
 
 mdw_MLIB(2.0.0)
 mdw_CATACOMB(2.1.0, [CFLAGS="$CFLAGS $CATACOMB_CFLAGS"])
 
 if test "$wireshark" = true -a "$WIRESHARK_PLUGIN_DIR" = unknown; then
-  AC_CACHE_CHECK([where to put Wireshark plugins], 
+  AC_CACHE_CHECK([where to put Wireshark plugins],
     [mdw_cv_wireshark_plugin_dir], [
     changequote(,)
     mdw_cv_wireshark_plugin_dir="failed"
@@ -180,7 +180,7 @@ if test "$wireshark" = true -a "$WIRESHARK_PLUGIN_DIR" = unknown; then
       wsver=`$wsbin -v | sed 's/^[^ ]* \([0-9A-Za-z.]*\).*$/\1/;q'`
       dir=$wsprefix/lib/wireshark/plugins/$wsver
       if test -d "$dir"; then
-        mdw_cv_wireshark_plugin_dir=$dir
+	mdw_cv_wireshark_plugin_dir=$dir
       fi
     fi
     changequote([, ])
@@ -198,7 +198,7 @@ if test "$wireshark" = true; then
   bad=true
   mdw_CFLAGS=$CFLAGS
   wsprefix=`echo $WIRESHARK_PLUGIN_DIR | sed 's:/lib/.*$::'`
-  AC_CACHE_CHECK([how to find the Wireshark headers], 
+  AC_CACHE_CHECK([how to find the Wireshark headers],
     [mdw_cv_wireshark_includes], [
     mdw_cv_wireshark_includes=failed
     for i in \
@@ -228,7 +228,7 @@ if test "$wireshark" = true; then
   ])
   case $mdw_cv_wireshark_includes in
     failed) wireshark=false;;
-  esac  
+  esac
 fi
 
 if test "$wireshark" = true; then
@@ -243,9 +243,9 @@ if test "$wireshark" = false -a "$requirewireshark" = true; then
 fi
 
 AH_TEMPLATE([CONFIGDIR],
-            [Tripe should look here for keys and other configuration.])
+	    [Tripe should look here for keys and other configuration.])
 AH_TEMPLATE([SOCKETDIR],
-            [Tripe should make its administration socket here.])
+	    [Tripe should make its administration socket here.])
 mdw_DEFINE_PATHS([
   mdw_DEFINE_PATH([CONFIGDIR], [$configdir])
   mdw_DEFINE_PATH([SOCKETDIR], [$socketdir])