From 82c75bd918446a91f93f8b448faa583da4608bd5 Mon Sep 17 00:00:00 2001 Message-Id: <82c75bd918446a91f93f8b448faa583da4608bd5.1715394363.git.mdw@distorted.org.uk> From: Mark Wooding Date: Tue, 18 Mar 2008 00:30:42 +0000 Subject: [PATCH] Infrastructure: Get it building again, using pkg-config. Organization: Straylight/Edgeware From: Mark Wooding --- client/Makefile.am | 2 +- configure.in | 134 ++++++++++++++++++++++++--------------------- debian/changelog | 2 +- doc/Makefile.am | 4 +- init/tripe-init.in | 2 +- proxy/Makefile.am | 2 +- server/Makefile.am | 2 +- 7 files changed, 79 insertions(+), 69 deletions(-) diff --git a/client/Makefile.am b/client/Makefile.am index f466ba48..a24e0d21 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -27,7 +27,7 @@ AUTOMAKE_OPTIONS = foreign INCLUDES = -I$(top_srcdir)/common -I$(top_builddir)/common -LDADD = ../common/libtripe.a @CATACOMB_LIBS@ +LDADD = ../common/libtripe.a bin_PROGRAMS = tripectl diff --git a/configure.in b/configure.in index b8dbbdef..e36e07cb 100644 --- a/configure.in +++ b/configure.in @@ -35,16 +35,18 @@ AC_PROG_CC AM_PROG_LIBTOOL DIRS="" AC_SUBST([DIRS]) -python=no -mdw_PROG_PYTHON([2.3], - [python=yes +AX_WITH_PYTHON([2.3], [missing]) +if test "$PYTHON" = "missing"; then + python=no +else + python=yes pyscripts='${PYTHONSCRIPTS}' DIRS="$DIRS keys" - pymans='${PYTHONMANS}']) + pymans='${PYTHONMANS}' +fi AC_SUBST([pyscripts]) AC_SUBST([pymans]) if test $python = yes; then - mdw_CHECK_PYTHON([2.3]) AC_CACHE_CHECK([for pygtk], [mdw_cv_pygtk], [ mdw_cv_pygtk=no python -c >&5 2>&5 ' @@ -61,9 +63,65 @@ import gtk fi AC_SUBST([pygtkscripts]) AC_SUBST([pygtkmans]) + +tun=auto +AC_ARG_WITH([tunnel], +[ --with-tunnel=KIND kinds of tunnel device to use + (linux, unet, bsd, slip)], +[tun=$withval]) + +if test "$tun" = auto; then + AC_CACHE_CHECK([tunnel drivers to use], [mdw_cv_tunnel], [ + mdw_cv_tunnel="" + case $host_os in + linux*) + case `uname -r` in + [2.[4-9].*] | [2.[1-9][0-9]*.*] | [[3-9].*] | [[1-9][0-9]*.*]) + mdw_cv_tunnel=linux + ;; + *) + mdw_cv_tunnel=unet + ;; + esac + ;; + *bsd*) + mdw_cv_tunnel=bsd + ;; + esac + mdw_cv_tunnel=$mdw_cv_tunnel${mdw_cv_tunnel:+ }slip + ]) + tun=$mdw_cv_tunnel +fi + +tunnels="" +for i in $tun; do + case $i in + linux) AC_DEFINE([TUN_LINUX], [1], + [Install the Linux TUN/TAP driver.]) ;; + bsd) AC_DEFINE([TUN_BSD], [1], + [Install the BSD tunnel driver.]) ;; + unet) AC_DEFINE([TUN_UNET], [1], + [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], + [List of tunnel drivers to install.]) + + + + + AC_CHECK_HEADERS([stdarg.h]) -mdw_GCC_FLAGS([-Wall]) -mdw_OPT_TRACE +AX_CFLAGS_WARN_ALL + +AC_ARG_WITH([tracing], +[ --without-tracing compile out tracing support (not recommended)], +[test "$withval" = no && AC_DEFINE([NTRACE], [1], [Disable all tracing.])], +[:]) AC_ARG_WITH([linux-includes], [ --with-linux-includes=DIR @@ -111,62 +169,14 @@ AC_ARG_WITH([wireshark], esac], [wireshark=true requirewireshark=false]) -tun=auto -AC_ARG_WITH([tunnel], -[ --with-tunnel=KIND kinds of tunnel device to use - (linux, unet, bsd, slip)], -[tun=$withval]) - -if test "$tun" = auto; then - AC_CACHE_CHECK([tunnel drivers to use], [mdw_cv_tunnel], [ - mdw_cv_tunnel="" - case $host_os in - linux*) - case `uname -r` in -changequote(,)dnl - 2.[4-9].* | 2.[1-9][0-9]*.* | [3-9].* | [1-9][0-9]*.*) -changequote([,])dnl - mdw_cv_tunnel=linux - ;; - *) - mdw_cv_tunnel=unet - ;; - esac - ;; - *bsd*) - mdw_cv_tunnel=bsd - ;; - esac - mdw_cv_tunnel=$mdw_cv_tunnel${mdw_cv_tunnel:+ }slip - ]) - tun=$mdw_cv_tunnel -fi - -tunnels="" -for i in $tun; do - case $i in - linux) AC_DEFINE([TUN_LINUX], [1], - [Install the Linux TUN/TAP driver.]) ;; - bsd) AC_DEFINE([TUN_BSD], [1], - [Install the BSD tunnel driver.]) ;; - unet) AC_DEFINE([TUN_UNET], [1], - [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], - [List of tunnel drivers to install.]) - -mdw_MLIB(2.0.0) -mdw_CATACOMB(2.1.0, [CFLAGS="$CFLAGS $CATACOMB_CFLAGS"]) +PKG_CHECK_MODULES(mLib, mLib >= 2.0.4) +PKG_CHECK_MODULES(catacomb, catacomb >= 2.1.1) +CFLAGS="$CFLAGS $mLib_CFLAGS $catacomb_CFLAGS" +LIBS="$LIBS $mLib_LIBS" if test "$wireshark" = true -a "$WIRESHARK_PLUGIN_DIR" = unknown; then AC_CACHE_CHECK([where to put Wireshark plugins], [mdw_cv_wireshark_plugin_dir], [ - changequote(,) mdw_cv_wireshark_plugin_dir="failed" wsprefix=none for i in "${prefix}" /usr/local /usr `echo $PATH | tr : " "`; do @@ -177,13 +187,13 @@ if test "$wireshark" = true -a "$WIRESHARK_PLUGIN_DIR" = unknown; then 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/$wsver + 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 - changequote([, ]) ]) case $mdw_cv_wireshark_plugin_dir in failed) wireshark=false;; diff --git a/debian/changelog b/debian/changelog index dc38e272..a6c80e5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ tripe (1.0.0pre7) experimental; urgency=low * Support SLIP encapsulation. - -- Mark Wooding Sun, 4 Sep 2005 00:52:56 +0100 + -- Mark Wooding Sun, 4 Sep 2005 00:52:56 +0100 tripe (1.0.0pre6) experimental; urgency=low diff --git a/doc/Makefile.am b/doc/Makefile.am index 09073cc5..c051ffd9 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -29,12 +29,12 @@ AUTOMAKE_OPTIONS = foreign CONST_MANS = pkstream.1 tripe-mitm.8 AUTO_MANS = tripe.8 tripectl.1 +PYTHONMANS = tripe-keys.8 tripe-keys.conf.5 +PYGTKMANS = tripemon.1 man_MANS = \ $(CONST_MANS) $(AUTO_MANS) tripe-admin.5 \ @pymans@ @pygtkmans@ -PYTHONMANS = tripe-keys.8 tripe-keys.conf.5 -PYGTKMANS = tripemon.1.in EXTRA_DIST = \ $(CONST_MANS) tripe-admin.5.in $(PYTHONMANS) $(PYGTKMANS) \ make-summary diff --git a/init/tripe-init.in b/init/tripe-init.in index bac4e7f2..bf7bdb67 100755 --- a/init/tripe-init.in +++ b/init/tripe-init.in @@ -33,7 +33,7 @@ case ${tunnel-`$tripe --tunnels | head -1`} in linux) case `uname -s` in Linux) - if { test -f /proc/misc && grep -q net/tun /proc/misc; } || + if { test -f /proc/misc && grep -q tun /proc/misc; } || modprobe -q tun; then : good else diff --git a/proxy/Makefile.am b/proxy/Makefile.am index ad9c70c2..a4defb80 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -27,7 +27,7 @@ AUTOMAKE_OPTIONS = foreign INCLUDES = -I$(top_srcdir)/common -I$(top_builddir)/common -LDADD = @CATACOMB_LIBS@ +LDADD = @catacomb_LIBS@ bin_PROGRAMS = tripe-mitm diff --git a/server/Makefile.am b/server/Makefile.am index e1748e2e..2d8f7f38 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -27,7 +27,7 @@ AUTOMAKE_OPTIONS = foreign INCLUDES = -I$(top_srcdir)/common -I$(top_builddir)/common -LDADD = ../common/libtripe.a @CATACOMB_LIBS@ +LDADD = ../common/libtripe.a $(catacomb_LIBS) configdir = @configdir@ tun = @tun@ -- [mdw]