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 '
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
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
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;;
~mdw / tripe / commitdiff